ddi-fw 0.0.46__tar.gz → 0.0.48__tar.gz

{ddi_fw-0.0.46 → ddi_fw-0.0.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddi_fw
-Version: 0.0.46
+Version: 0.0.48
 Summary: Do not use :)
 Author-email: Kıvanç Bayraktar <bayraktarkivanc@gmail.com>
 Maintainer-email: Kıvanç Bayraktar <bayraktarkivanc@gmail.com>

{ddi_fw-0.0.46 → ddi_fw-0.0.48}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ddi_fw"
-version = "0.0.46"
+version = "0.0.48"
 description = "Do not use :)"
 readme = "README.md"
 authors = [

{ddi_fw-0.0.46 → ddi_fw-0.0.48}/src/ddi_fw/datasets/core.py

@@ -379,13 +379,13 @@ class BaseDataset(ABC):
                 # return np.hstack(
                 #     (value[row['id1']], value[row['id2']]), dtype=np.float16)
 
-        def x_fnc(row, embedding_column, embeddings_after_pooling):
-            if row['id1'] in self.embedding_dict[embedding_column]:
-                v1 = embeddings_after_pooling[embedding_column][row['id1']]
+        def x_fnc(row, embeddings_after_pooling):
+            if row['id1'] in embeddings_after_pooling:
+                v1 = embeddings_after_pooling[row['id1']]
             else:
                 v1 = np.zeros(self.embedding_size)
-            if row['id2'] in self.embedding_dict[embedding_column]:
-                v2 = embeddings_after_pooling[embedding_column][row['id2']]
+            if row['id2'] in embeddings_after_pooling:
+                v2 = embeddings_after_pooling[row['id2']]
             else:
                 v2 = np.zeros(self.embedding_size)
             return np.float16(np.hstack(
@@ -404,7 +404,7 @@ class BaseDataset(ABC):
                 v) for k, v in self.embedding_dict[embedding_column].items()}
             # column_embeddings_dict = embedding_values[embedding_column]
             self.ddis_df[embedding_column+'_embedding'] = self.ddis_df.apply(
-                x_fnc, args=(embedding_column, embeddings_after_pooling), axis=1)
+                x_fnc, args=(embeddings_after_pooling,), axis=1)
 
         self.dataframe = self.ddis_df.copy()
         self.dataframe['class'] = list(classes)

{ddi_fw-0.0.46 → ddi_fw-0.0.48}/src/ddi_fw/datasets/ddi_mdl/base.py

@@ -10,19 +10,25 @@ HERE = pathlib.Path(__file__).resolve().parent
 
 
 class DDIMDLDataset(BaseDataset):
-    def __init__(self, embedding_size, embedding_dict,embeddings_pooling_strategy:PoolingStrategy, ner_df, chemical_property_columns=['enzyme',
-                                                   'target',
-                                                   'pathway',
-                                                   'smile'],
+    def __init__(self, embedding_size, embedding_dict, embeddings_pooling_strategy: PoolingStrategy, ner_df, chemical_property_columns=['enzyme',
+                                                                                                                                        'target',
+                                                                                                                                        'pathway',
+                                                                                                                                        'smile'],
                  embedding_columns=[],
                  ner_columns=[],
                  **kwargs):
 
-        super().__init__(embedding_size, embedding_dict,ner_df,embeddings_pooling_strategy, chemical_property_columns, embedding_columns,
-                         ner_columns, **kwargs)
+        super().__init__(embedding_size=embedding_size,
+                         embedding_dict=embedding_dict,
+                         embeddings_pooling_strategy=embeddings_pooling_strategy,
+                         ner_df=ner_df,
+                         chemical_property_columns=chemical_property_columns,
+                         embedding_columns=embedding_columns,
+                         ner_columns=ner_columns,
+                         **kwargs)
 
         # kwargs = {'index_path': str(HERE.joinpath('indexes'))}
-        kwargs['index_path']= str(HERE.joinpath('indexes'))
+        kwargs['index_path'] = str(HERE.joinpath('indexes'))
 
         db = HERE.joinpath('data/event.db')
         conn = create_connection(db)

{ddi_fw-0.0.46 → ddi_fw-0.0.48}/src/ddi_fw.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddi_fw
-Version: 0.0.46
+Version: 0.0.48
 Summary: Do not use :)
 Author-email: Kıvanç Bayraktar <bayraktarkivanc@gmail.com>
 Maintainer-email: Kıvanç Bayraktar <bayraktarkivanc@gmail.com>