ddi-fw 0.0.191__py3-none-any.whl → 0.0.193__py3-none-any.whl

ddi_fw/datasets/core.py

@@ -81,7 +81,10 @@ class BaseDataset(BaseModel):
         y_train_label, y_test_label = np.array(
             self.y_train), np.array(self.y_test)
 
-        if self.columns is None or len(self.columns) == 0:
+        if self.columns is None or len(self.columns) == 0 or len(self.columns) == 1:
+            # If no columns or only one column are provided, do not change the data
+            # and use the entire dataset as a single input.
+            column = self.columns[0] if self.columns else 'default'
             items.append([f'default', np.nan_to_num(self.X_train),
                           y_train_label, np.nan_to_num(self.X_test), y_test_label])
         else:

ddi_fw/ml/ml_helper.py

@@ -79,11 +79,11 @@ class MultiModalRunner:
                 if input is not None and inputs is not None:
                     raise Exception("input and inputs should not be used together")
                 
-                if input_type == '1D':
+                if input:
                     item = item_dict[input]
                     single_modal.set_data(
                         self.train_idx_arr, self.val_idx_arr, item[1], item[2], item[3], item[4])
-                elif input_type == '2D':
+                elif inputs:
                     # check keys
                     filtered_dict = {k: item_dict[k]
                                     for k in inputs if k in item_dict}
@@ -99,7 +99,7 @@ class MultiModalRunner:
                         self.train_idx_arr, self.val_idx_arr, train_data, train_label, test_data, test_label)
                 else:
                     raise Exception("check configurations")
-            else:
+            else: # TODO default model maybe?
                 item = self.items[0]
                 single_modal.set_data(
                         self.train_idx_arr, self.val_idx_arr, item[1], item[2], item[3], item[4])

ddi_fw/pipeline/pipeline.py

@@ -194,9 +194,9 @@ class Pipeline(BaseModel):
         # column name, train data, train label, test data, test label
         self._items = dataset.produce_inputs()
 
-        print("Building the experiment with the following settings:")
-        print(
-            f"Name: {self.experiment_name}, Dataset: {dataset}, Model: {self.model}")
+        print(f"Building the experiment: {self.experiment_name}")
+        # print(
+        #     f"Name: {self.experiment_name}, Dataset: {dataset}, Model: {self.model}")
         # Implement additional build logic as needed
         return self
 

ddi_fw/vectorization/feature_vector_generation.py

@@ -36,7 +36,7 @@ class SimilarityMatrixGenerator:
 
     # https://github.com/YifanDengWHU/DDIMDL/blob/master/DDIMDL.py , def Jaccard(matrix):
     def create_jaccard_similarity_matrices(self, matrix)->np.ndarray:
-        matrix = np.mat(matrix)
+        matrix = np.asmatrix(matrix)
         numerator = matrix * matrix.T
         denominator = np.ones(np.shape(matrix)) * matrix.T + \
             matrix * np.ones(np.shape(matrix.T)) - matrix * matrix.T

{ddi_fw-0.0.191.dist-info → ddi_fw-0.0.193.dist-info}/METADATA

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

{ddi_fw-0.0.191.dist-info → ddi_fw-0.0.193.dist-info}/RECORD

@@ -1,5 +1,5 @@
 ddi_fw/datasets/__init__.py,sha256=_I3iDHARwzmg7_EL5XKtB_TgG1yAkLSOVTujLL9Wz9Q,280
-ddi_fw/datasets/core.py,sha256=IaEk4T7f590rAAAG7Nc45mofeutX85mNxhikFs7mzpE,10839
+ddi_fw/datasets/core.py,sha256=4705a94kKBueyWFXRJ3cnivAGKjrR89uBBKpxtMozOM,11080
 ddi_fw/datasets/dataset_splitter.py,sha256=8H8uZTAf8N9LUZeSeHOMawtJFJhnDgUUqFcnl7dquBQ,1672
 ddi_fw/datasets/db_utils.py,sha256=OTsa3d-Iic7z3HmzSQK9UigedRbHDxYChJk0s4GfLnw,6191
 ddi_fw/datasets/setup_._py,sha256=khYVJuW5PlOY_i_A16F3UbSZ6s6o_ljw33Byw3C-A8E,1047
@@ -74,7 +74,7 @@ ddi_fw/langchain/sentence_splitter.py,sha256=h_bYElx4Ud1mwDNJfL7mUwvgadwKX3GKlSz
 ddi_fw/langchain/storage.py,sha256=OizKyWm74Js7T6Q9kez-ulUoBGzIMFo4R46h4kjUyIM,11200
 ddi_fw/ml/__init__.py,sha256=tIxiW0g6q1VsmDYVXR_ovvHQR3SCir8g2bKxx_CrS7s,221
 ddi_fw/ml/evaluation_helper.py,sha256=2-7CLSgGTqLEk4HkgCVIOt-GxfLAn6SBozJghAtHb5M,11581
-ddi_fw/ml/ml_helper.py,sha256=ENjdpu6stRxGxqhFweZLIglCnLREtMh6ypwanf0qMGc,6940
+ddi_fw/ml/ml_helper.py,sha256=-pgnLhuPBp60IZxAvS11oDYggrgQY3GRHkAwQVWM9XI,6943
 ddi_fw/ml/model_wrapper.py,sha256=kabPXuo7S8tGkp9a00V04n4rXDmv7dD8wYGMjotISRc,1050
 ddi_fw/ml/pytorch_wrapper.py,sha256=pe6UsjP2XeTgLxDnIUiodoyhJTGCxV27wD4Cjxysu2Q,8553
 ddi_fw/ml/tensorflow_wrapper.py,sha256=lNJvg3odqMKmILecOMdcOCAOrwzWZDzxB0DWGcYWsPg,12952
@@ -85,7 +85,7 @@ ddi_fw/pipeline/__init__.py,sha256=tKDM_rW4vPjlYTeOkNgi9PujDzb4e9O3LK1w5wqnebw,2
 ddi_fw/pipeline/multi_modal_combination_strategy.py,sha256=JSyuP71b1I1yuk0s2ecCJZTtCED85jBtkpwTUxibJvI,1706
 ddi_fw/pipeline/multi_pipeline.py,sha256=fYyvwIOscUahjXd3QO5RSFrp1LliGR7RzOZyAXrXXz4,5637
 ddi_fw/pipeline/ner_pipeline.py,sha256=Bp6BA6nozfWFaMHH6jKlzesnCGO6qiMkzdGy_ed6nh0,5947
-ddi_fw/pipeline/pipeline.py,sha256=GMMauyp0GvdaQLyQ5dPBffDDxFK28hdDtPUzdFX9-Yk,9961
+ddi_fw/pipeline/pipeline.py,sha256=fRNUmKMrIiN_pX0aU57FGxaZ-1gdaI9IPBwAv3qgO7o,9961
 ddi_fw/utils/__init__.py,sha256=HC32XkYQTYH_9vt0eX6tqQngEFG-R70hGrYkT-BcHCk,519
 ddi_fw/utils/categorical_data_encoding_checker.py,sha256=gzb_vUDBrCMUhBxY1fBYTe8hmK72p0_uw3DTga8cqP8,1580
 ddi_fw/utils/enums.py,sha256=19eJ3fX5eRK_xPvkYcukmug144jXPH4X9zQqtsFBj5A,671
@@ -97,9 +97,9 @@ ddi_fw/utils/py7zr_helper.py,sha256=gOqaFIyJvTjUM-btO2x9AQ69jZOS8PoKN0wetYIckJw,
 ddi_fw/utils/utils.py,sha256=szwnxMTDRrZoeNRyDuf3aCbtzriwtaRk4mHSH3asLdA,4301
 ddi_fw/utils/zip_helper.py,sha256=YRZA4tKZVBJwGQM0_WK6L-y5MoqkKoC-nXuuHK6CU9I,5567
 ddi_fw/vectorization/__init__.py,sha256=LcJOpLVoLvHPDw9phGFlUQGeNcST_zKV-Oi1Pm5h_nE,110
-ddi_fw/vectorization/feature_vector_generation.py,sha256=Z1A_DOBqDFPqLN4YB-3oYlOQWJK-X6Oes6UFjpzR47Q,4760
+ddi_fw/vectorization/feature_vector_generation.py,sha256=EBf-XAiwQwr68az91erEYNegfeqssBR29kVgrliIyac,4765
 ddi_fw/vectorization/idf_helper.py,sha256=_Gd1dtDSLaw8o-o0JugzSKMt9FpeXewTh4wGEaUd4VQ,2571
-ddi_fw-0.0.191.dist-info/METADATA,sha256=xrlNEz8W_iIfKVZidKR8kNa_WtrDr4EnVQwbtex_sbQ,2542
-ddi_fw-0.0.191.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-ddi_fw-0.0.191.dist-info/top_level.txt,sha256=PMwHICFZTZtcpzQNPV4UQnfNXYIeLR_Ste-Wfc1h810,7
-ddi_fw-0.0.191.dist-info/RECORD,,
+ddi_fw-0.0.193.dist-info/METADATA,sha256=onl9mPw_lsOyg_rdTxnYXNVGFGULp-SMmDGz82vPZE0,2542
+ddi_fw-0.0.193.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ddi_fw-0.0.193.dist-info/top_level.txt,sha256=PMwHICFZTZtcpzQNPV4UQnfNXYIeLR_Ste-Wfc1h810,7
+ddi_fw-0.0.193.dist-info/RECORD,,