From 946f11119b9d1c7677f29ab6a0df5d5f36c3eef8 Mon Sep 17 00:00:00 2001
From: tramyn <tramy.nguy@gmail.com>
Date: Fri, 9 Oct 2020 17:55:54 -0700
Subject: [PATCH 1/3] create convert_part_library function in main.py

---
 excel2sbol/main.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/excel2sbol/main.py b/excel2sbol/main.py
index 2c43737c..b01849c8 100644
--- a/excel2sbol/main.py
+++ b/excel2sbol/main.py
@@ -1,4 +1,28 @@
 import argparse
+import excel2sbol.utils.converter_utils as converter_utils
+import pandas as pd
+
+def convert_part_library(input_excel: str, output_file: str):
+    # Read in template and filled spreadsheet for the Parts library
+    start_row = 13
+    nrows = 8
+    description_row = 9
+
+    filled_library, filled_library_metadata, filled_description = converter_utils.read_library(input_excel,
+                                                                               start_row=start_row, nrows=nrows,
+                                                                               description_row=description_row)
+    blank_library, blank_library_metadata, blank_description = converter_utils.read_library(input_excel,
+                                                                            start_row=start_row, nrows=nrows,
+                                                                            description_row=description_row)
+
+    ontology = pd.read_excel(input_excel, header=None, sheet_name="Ontology Terms", skiprows=3, index_col=0)
+    ontology = ontology.to_dict("dict")[1]
+
+    converter_utils.quality_check(filled_library, blank_library, filled_library_metadata, blank_library_metadata, filled_description, blank_description)
+
+    # Create SBOL document
+    doc = converter_utils.write_sbol(filled_library, filled_library_metadata, filled_description, ontology)
+    doc.write(output_file)
 
 def main():
     parser = argparse.ArgumentParser(description='Creates libraries of basic parts by converting a spreadsheet to SBOL.')

From 4a8c79ed2c69a9acee7700d8c33abe50518940f4 Mon Sep 17 00:00:00 2001
From: tramyn <tramy.nguy@gmail.com>
Date: Fri, 9 Oct 2020 18:32:21 -0700
Subject: [PATCH 2/3] create structure for reading excel templates

---
 excel2sbol/converter/part_library_converter.py      |   2 +-
 excel2sbol/converter/template.py                    |   5 +++++
 excel2sbol/converter/template_factory.py            |   7 +++++++
 excel2sbol/main.py                                  |   4 ++--
 .../resources/Composition_reading.py                |   4 ++--
 Excel.py => excel2sbol/resources/Excel.py           |   6 +++---
 .../resources/templates}/darpa_template_blank.xlsx  | Bin
 excel2sbol/utils/excel_template_constants.py        |   0
 8 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 excel2sbol/converter/template.py
 create mode 100644 excel2sbol/converter/template_factory.py
 rename Composition_reading.py => excel2sbol/resources/Composition_reading.py (89%)
 rename Excel.py => excel2sbol/resources/Excel.py (80%)
 rename {templates => excel2sbol/resources/templates}/darpa_template_blank.xlsx (100%)
 create mode 100644 excel2sbol/utils/excel_template_constants.py

diff --git a/excel2sbol/converter/part_library_converter.py b/excel2sbol/converter/part_library_converter.py
index 17471777..ee3f71c0 100644
--- a/excel2sbol/converter/part_library_converter.py
+++ b/excel2sbol/converter/part_library_converter.py
@@ -1,5 +1,5 @@
 
 class PartLibraryConverter(object):
-
+    DARPA_TEMPLATE = ''
     def __init__(self):
         pass
\ No newline at end of file
diff --git a/excel2sbol/converter/template.py b/excel2sbol/converter/template.py
new file mode 100644
index 00000000..f868acdc
--- /dev/null
+++ b/excel2sbol/converter/template.py
@@ -0,0 +1,5 @@
+
+class Template(object):
+
+    def __init__(self):
+        pass
diff --git a/excel2sbol/converter/template_factory.py b/excel2sbol/converter/template_factory.py
new file mode 100644
index 00000000..9106f160
--- /dev/null
+++ b/excel2sbol/converter/template_factory.py
@@ -0,0 +1,7 @@
+class TemplateFactory(object):
+
+    def __init__(self):
+        pass
+
+    def create_darpa_template(self):
+        pass
diff --git a/excel2sbol/main.py b/excel2sbol/main.py
index b01849c8..1ac7b998 100644
--- a/excel2sbol/main.py
+++ b/excel2sbol/main.py
@@ -7,11 +7,11 @@ def convert_part_library(input_excel: str, output_file: str):
     start_row = 13
     nrows = 8
     description_row = 9
-
+    path_blank = None # TODO: os.path.join(cwd, "templates/darpa_template_blank.xlsx")
     filled_library, filled_library_metadata, filled_description = converter_utils.read_library(input_excel,
                                                                                start_row=start_row, nrows=nrows,
                                                                                description_row=description_row)
-    blank_library, blank_library_metadata, blank_description = converter_utils.read_library(input_excel,
+    blank_library, blank_library_metadata, blank_description = converter_utils.read_library(path_blank,
                                                                             start_row=start_row, nrows=nrows,
                                                                             description_row=description_row)
 
diff --git a/Composition_reading.py b/excel2sbol/resources/Composition_reading.py
similarity index 89%
rename from Composition_reading.py
rename to excel2sbol/resources/Composition_reading.py
index a384a71f..f8b35572 100644
--- a/Composition_reading.py
+++ b/excel2sbol/resources/Composition_reading.py
@@ -8,8 +8,8 @@
 #Set up
 import os
 import pandas as pd
-from excel2sbol.functions import quality_check_metadata, load_libraries, get_data
-from excel2sbol.functions import get_parts, check_name, write_sbol_comp, fix_msec_sbol
+from excel2sbol.utils.converter_utils import quality_check_metadata, load_libraries, get_data
+from excel2sbol.utils.converter_utils import get_parts, check_name, write_sbol_comp, fix_msec_sbol
 
 cwd = os.path.dirname(os.path.abspath("__file__")) #get current working directory
 path_filled = os.path.join(cwd, "templates", "darpa_template.xlsx")
diff --git a/Excel.py b/excel2sbol/resources/Excel.py
similarity index 80%
rename from Excel.py
rename to excel2sbol/resources/Excel.py
index 4d6d29a2..c110ecf1 100644
--- a/Excel.py
+++ b/excel2sbol/resources/Excel.py
@@ -9,13 +9,13 @@
 #Setup
 import pandas as pd
 import os
-from excel2sbol.functions import read_library, quality_check, write_sbol
+from excel2sbol.utils.converter_utils import read_library, quality_check, write_sbol
 
 
 cwd = os.path.dirname(os.path.abspath("__file__")) #get current working directory
 path_blank = os.path.join(cwd, "templates/darpa_template_blank.xlsx")
-# path_filled = os.path.join("C:\\Users\\JVM\\Downloads\\build-request-template_BsPpVn.xlsx")
-# file_path_out = "C:\\Users\\JVM\\Downloads\\converted.xml"
+path_filled = None #os.path.join("C:\\Users\\JVM\\Downloads\\build-request-template_BsPpVn.xlsx")
+file_path_out = None #"C:\\Users\\JVM\\Downloads\\converted.xml"
 
 #Read in template and filled spreadsheet for the Parts library
 start_row = 13
diff --git a/templates/darpa_template_blank.xlsx b/excel2sbol/resources/templates/darpa_template_blank.xlsx
similarity index 100%
rename from templates/darpa_template_blank.xlsx
rename to excel2sbol/resources/templates/darpa_template_blank.xlsx
diff --git a/excel2sbol/utils/excel_template_constants.py b/excel2sbol/utils/excel_template_constants.py
new file mode 100644
index 00000000..e69de29b

From d46e156c064a911894b2c90bec477c50705de79d Mon Sep 17 00:00:00 2001
From: tramyn <tramy.nguy@gmail.com>
Date: Fri, 9 Oct 2020 19:59:22 -0700
Subject: [PATCH 3/3] create golden file testing for convering part library and
 composite reading

---
 excel2sbol/main.py                            |  49 ++++++++++++++++--
 .../tests/data/darpa_template_blank.xlsx      | Bin 0 -> 20983 bytes
 excel2sbol/tests/test_golden_files.py         |  29 +++++++++--
 excel2sbol/utils/converter_utils.py           |  14 ++---
 requirements.txt                              |   1 +
 5 files changed, 78 insertions(+), 15 deletions(-)
 create mode 100644 excel2sbol/tests/data/darpa_template_blank.xlsx

diff --git a/excel2sbol/main.py b/excel2sbol/main.py
index 1ac7b998..50c470e0 100644
--- a/excel2sbol/main.py
+++ b/excel2sbol/main.py
@@ -2,27 +2,66 @@
 import excel2sbol.utils.converter_utils as converter_utils
 import pandas as pd
 
-def convert_part_library(input_excel: str, output_file: str):
+def convert_part_library(template_file: str, input_excel: str):
     # Read in template and filled spreadsheet for the Parts library
     start_row = 13
     nrows = 8
     description_row = 9
-    path_blank = None # TODO: os.path.join(cwd, "templates/darpa_template_blank.xlsx")
     filled_library, filled_library_metadata, filled_description = converter_utils.read_library(input_excel,
                                                                                start_row=start_row, nrows=nrows,
                                                                                description_row=description_row)
-    blank_library, blank_library_metadata, blank_description = converter_utils.read_library(path_blank,
+    blank_library, blank_library_metadata, blank_description = converter_utils.read_library(template_file,
                                                                             start_row=start_row, nrows=nrows,
                                                                             description_row=description_row)
 
     ontology = pd.read_excel(input_excel, header=None, sheet_name="Ontology Terms", skiprows=3, index_col=0)
     ontology = ontology.to_dict("dict")[1]
 
-    converter_utils.quality_check(filled_library, blank_library, filled_library_metadata, blank_library_metadata, filled_description, blank_description)
+    converter_utils.quality_check(filled_library,
+                                  blank_library,
+                                  filled_library_metadata,
+                                  blank_library_metadata,
+                                  filled_description,
+                                  blank_description, nrows, description_row)
 
     # Create SBOL document
     doc = converter_utils.write_sbol(filled_library, filled_library_metadata, filled_description, ontology)
-    doc.write(output_file)
+    return doc
+
+def convert_composition_reading(template_file: str, input_excel: str):
+    # Load Data
+    startrow_composition = 9
+    sheet_name = "Composite Parts"
+    nrows = 8
+    use_cols = [0, 1]
+    # read in whole composite sheet below metadata
+    table = pd.read_excel(input_excel, sheet_name=sheet_name,
+                          header=None, skiprows=startrow_composition)
+
+    # Load Metadata
+    filled_composition_metadata = pd.read_excel(input_excel, sheet_name=sheet_name,
+                                                header=None, nrows=nrows, usecols=use_cols)
+    blank_composition_metadata = pd.read_excel(template_file, sheet_name=sheet_name,
+                                               header=None, nrows=nrows, usecols=use_cols)
+
+    # Compare the metadata to the template
+    converter_utils.quality_check_metadata(filled_composition_metadata, blank_composition_metadata)
+
+    # Load Libraries required for Parts
+    libraries = converter_utils.load_libraries(table)
+
+    # Loop over all rows and find those where each block begins
+    compositions, list_of_rows = converter_utils.get_data(table)
+
+    # Extract parts from table
+    compositions, all_parts = converter_utils.get_parts(list_of_rows, table, compositions)
+
+    # Check if Collection names are alphanumeric and separated by underscore
+    compositions = converter_utils.check_name(compositions)
+
+    # Create sbol
+    doc = converter_utils.write_sbol_comp(libraries, compositions, all_parts)
+    return doc
 
 def main():
     parser = argparse.ArgumentParser(description='Creates libraries of basic parts by converting a spreadsheet to SBOL.')
diff --git a/excel2sbol/tests/data/darpa_template_blank.xlsx b/excel2sbol/tests/data/darpa_template_blank.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..20cce1f6660c1b84f628ccf8b9ea9e6c5ac534cb
GIT binary patch
literal 20983
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

literal 0
HcmV?d00001

diff --git a/excel2sbol/tests/test_golden_files.py b/excel2sbol/tests/test_golden_files.py
index c8c8e950..f1e617cf 100644
--- a/excel2sbol/tests/test_golden_files.py
+++ b/excel2sbol/tests/test_golden_files.py
@@ -1,14 +1,37 @@
+import excel2sbol.main as tool
 import os
 import unittest
 
 class GoldenFileTest(unittest.TestCase):
 
-    def setup(self):
+    @classmethod
+    def setUpClass(cls):
+        pass
+
+    def setUp(self):
         curr_path = os.path.dirname(os.path.realpath(__file__))
         self.data_dir = os.path.join(curr_path, 'data')
 
     def tearDown(self):
         pass
 
-    def test_library_file(self):
-        pass
\ No newline at end of file
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+    def test_convert_part_library(self):
+        file = 'darpa_template.xlsx'
+        input_file_path = os.path.join(self.data_dir, file)
+        template_file = os.path.join(self.data_dir, 'darpa_template_blank.xlsx')
+        output_doc = tool.convert_part_library(template_file=template_file, input_excel=input_file_path)
+        self.assertTrue(output_doc)
+
+        dna_parts = output_doc.componentDefinitions
+        self.assertEqual(5, len(dna_parts))
+
+    def test_convert_composition_reading(self):
+        file = 'darpa_template.xlsx'
+        input_file_path = os.path.join(self.data_dir, file)
+        template_file = os.path.join(self.data_dir, 'darpa_template_blank.xlsx')
+        output_doc = tool.convert_composition_reading(template_file=template_file, input_excel=input_file_path)
+        self.assertTrue(output_doc)
diff --git a/excel2sbol/utils/converter_utils.py b/excel2sbol/utils/converter_utils.py
index e3a23420..59f6f9ad 100755
--- a/excel2sbol/utils/converter_utils.py
+++ b/excel2sbol/utils/converter_utils.py
@@ -432,19 +432,19 @@ def read_library(path, start_row, nrows, description_row, use_cols = [0, 1],
                  start_row = 13, nrows = 8, description_row = 9)
 
     """
-    basic_DNA_parts = pd.read_excel (path, sheet_name = sheet_name, 
-                                     header= 0, skiprows = start_row)
+    basic_DNA_parts = pd.read_excel(path, sheet_name=sheet_name,
+                                     header=0, skiprows=start_row)
     
-    metadata = pd.read_excel (path, sheet_name = sheet_name,
-                              header= None, nrows = nrows, usecols = use_cols)
+    metadata = pd.read_excel (path, sheet_name=sheet_name,
+                              header=None, nrows=nrows, usecols=use_cols)
     
-    description = pd.read_excel (path, sheet_name = sheet_name, skiprows = description_row,
-                                 nrows = 1, usecols = description_col)
+    description = pd.read_excel (path, sheet_name=sheet_name, skiprows=description_row,
+                                 nrows=1, usecols=description_col)
     
     return (basic_DNA_parts, metadata, description)
 
 def quality_check(filled_library, blank_library, filled_metadata, blank_metadata, filled_description,
-                  blank_description, nrows, description_row, description_col=[0], use_cols = [0,1]):
+                  blank_description, nrows, description_row, description_col=[0], use_cols=[0,1]):
     """
     the function compares the edited excel spreadsheet with the template
 
diff --git a/requirements.txt b/requirements.txt
index 1f83cd2a..8fef2149 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
 sbol2==1.0b8
 pandas==1.0.1
 numpy==1.18.1
+xlrd >= 1.0.0