ddi-fw 0.0.188__py3-none-any.whl → 0.0.190__py3-none-any.whl

ddi_fw/datasets/core.py

@@ -158,9 +158,11 @@ class BaseDataset(BaseModel):
         y_test = test[self.class_column]
         
         self.X_train = np.array(X_train)
-        self.y_train = np.array(y_train)
+        # self.y_train = np.array(y_train)
+        self.y_train = np.array(y_train.tolist())
         self.X_test = np.array(X_test)
-        self.y_test = np.array(y_test)
+        # self.y_test = np.array(y_test)
+        self.y_test = np.array(y_test.tolist())
 
         self.train_indexes = X_train.index
         self.test_indexes = X_test.index

ddi_fw/ml/ml_helper.py

@@ -57,7 +57,7 @@ class MultiModalRunner:
             raise ValueError(
                 "Unsupported library type. Choose 'tensorflow' or 'pytorch'.")
 
-    def __predict(self,single_results):
+    def __predict(self, single_results):
         item_dict = {t[0]: t for t in self.items}
         print("multi_modal")
         print(self.multi_modal)
@@ -71,7 +71,8 @@ class MultiModalRunner:
             model_type = get_import(m.get("model_type"))
             kwargs = m.get('params')
             T = self.__create_model(self.library)
-            single_modal = T(self.date, name, model_type, **kwargs)
+            single_modal = T(self.date, name, model_type,
+                             use_mlflow=self.use_mlflow,  **kwargs)
             if input_type == '1D':
                 item = item_dict[input]
                 single_modal.set_data(
@@ -79,7 +80,7 @@ class MultiModalRunner:
             elif input_type == '2D':
                 # check keys
                 filtered_dict = {k: item_dict[k]
-                                    for k in inputs if k in item_dict}
+                                 for k in inputs if k in item_dict}
                 print(filtered_dict.keys())
                 first_input = next(iter(filtered_dict.values()))
                 train_data_list = [f[1] for f in filtered_dict.values()]

ddi_fw/ml/tensorflow_wrapper.py

@@ -64,7 +64,7 @@ def convert_to_categorical(arr, num_classes):
 
 class TFModelWrapper(ModelWrapper):
 
-    def __init__(self, date, descriptor, model_func, use_mlflow=True, **kwargs):
+    def __init__(self, date, descriptor, model_func, use_mlflow=False, **kwargs):
         super().__init__(date, descriptor, model_func, **kwargs)
         self.batch_size = kwargs.get('batch_size', 128)
         self.epochs = kwargs.get('epochs', 100)

ddi_fw/utils/__init__.py

@@ -4,4 +4,5 @@ from .py7zr_helper import Py7ZipHelper
 from .enums import UMLSCodeTypes, DrugBankTextDataTypes
 from .package_helper import get_import
 from .kaggle import create_kaggle_dataset
-from .categorical_data_encoding_checker import is_one_hot_encoded, is_binary_encoded, is_binary_vector,is_label_encoded
+from .categorical_data_encoding_checker import is_one_hot_encoded, is_binary_encoded, is_binary_vector,is_label_encoded
+from .numpy_utils import adjust_array_dims

ddi_fw/utils/numpy_utils.py

@@ -0,0 +1,27 @@
+import numpy as np
+
+def adjust_array_dims(arr, final_ndim=2):
+    # Add axes if array has fewer dimensions than final_ndim
+    while arr.ndim < final_ndim:
+        arr = arr[:, np.newaxis]  # Add a new axis
+        
+    # Drop axes if array has more dimensions than final_ndim
+    while arr.ndim > final_ndim:
+        arr = np.squeeze(arr, axis=-1)  # Remove the last axis
+    
+    return arr
+
+
+
+# # Example usage
+# arr_1d = np.array([1, 2, 3, 4, 5])
+
+# # Convert to a 3D array (iteratively adds axes)
+# arr_3d = adjust_array_dims(arr_1d, final_ndim=3)
+# print(arr_3d)
+# print("Shape of arr_3d:", arr_3d.shape)
+
+# # Convert to a 2D array (iteratively drops axes)
+# arr_2d = adjust_array_dims(arr_3d, final_ndim=2)
+# print(arr_2d)
+# print("Shape of arr_2d:", arr_2d.shape)

{ddi_fw-0.0.188.dist-info → ddi_fw-0.0.190.dist-info}/METADATA

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

{ddi_fw-0.0.188.dist-info → ddi_fw-0.0.190.dist-info}/RECORD

@@ -1,5 +1,5 @@
 ddi_fw/datasets/__init__.py,sha256=_I3iDHARwzmg7_EL5XKtB_TgG1yAkLSOVTujLL9Wz9Q,280
-ddi_fw/datasets/core.py,sha256=eKPbntiDhqpqaV1SlrPmuSUq_9i_5INlnJuAlwj61Nk,10630
+ddi_fw/datasets/core.py,sha256=WWWd5SGHVUpJn-IJF1p1PScSWpb7VfQdcMTroufkgUk,10734
 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,10 +74,10 @@ 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=l1ZLYL3x5bHxD2bh2ezEgWDlV0ni8zGZGgj07x7KR40,6310
+ddi_fw/ml/ml_helper.py,sha256=xbIg0fAJeJuB7rlgUMzCFhQ4WLBXS35x5N5gCcs6-so,6367
 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=-zcbd0LBg9QNMF9K1I-JC379cS3rTO7ibgsDIOnMsoc,12951
+ddi_fw/ml/tensorflow_wrapper.py,sha256=lNJvg3odqMKmILecOMdcOCAOrwzWZDzxB0DWGcYWsPg,12952
 ddi_fw/ner/__init__.py,sha256=JwhGXrepomxPSsGsg2b_xPRC72AjvxOIn2CW5Mvscn0,26
 ddi_fw/ner/mmlrestclient.py,sha256=NZta7m2Qm6I_qtVguMZhqtAUjVBmmXn0-TMnsNp0jpg,6859
 ddi_fw/ner/ner.py,sha256=FHyyX53Xwpdw8Hec261dyN88yD7Z9LmJua2mIrQLguI,17967
@@ -86,11 +86,12 @@ ddi_fw/pipeline/multi_modal_combination_strategy.py,sha256=JSyuP71b1I1yuk0s2ecCJ
 ddi_fw/pipeline/multi_pipeline.py,sha256=NfcH4Ze5U-JRiH3lrxEDWj-VPxYQYtp7tq6bLCImBzs,5550
 ddi_fw/pipeline/ner_pipeline.py,sha256=Bp6BA6nozfWFaMHH6jKlzesnCGO6qiMkzdGy_ed6nh0,5947
 ddi_fw/pipeline/pipeline.py,sha256=dCXZuXOlW74ZO0e_OhS9OX0dqI9abj7CQz_lkKrDIWY,9787
-ddi_fw/utils/__init__.py,sha256=bqIC0YjbD0YSHtO0nWUkRs4w5nu7qBV0yU72sRzwCj8,475
+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
 ddi_fw/utils/json_helper.py,sha256=BVU6wmJgdXPxyqLPu3Ck_9Es5RrP1PDanKvE-OSj1D4,571
 ddi_fw/utils/kaggle.py,sha256=wKRJ18KpQ6P-CubpZklEgsDtyFpR9RUL1_HyyF6ttEE,2425
+ddi_fw/utils/numpy_utils.py,sha256=gd1WNq5NpWD2MBEMTtFuS5I0h8B6FAUNcq6BVOlxdhY,797
 ddi_fw/utils/package_helper.py,sha256=erl8_onmhK-41zQoaED2qyDUV9GQxmT9sdoyRp9_q5I,1056
 ddi_fw/utils/py7zr_helper.py,sha256=gOqaFIyJvTjUM-btO2x9AQ69jZOS8PoKN0wetYIckJw,4747
 ddi_fw/utils/utils.py,sha256=szwnxMTDRrZoeNRyDuf3aCbtzriwtaRk4mHSH3asLdA,4301
@@ -98,7 +99,7 @@ ddi_fw/utils/zip_helper.py,sha256=YRZA4tKZVBJwGQM0_WK6L-y5MoqkKoC-nXuuHK6CU9I,55
 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/idf_helper.py,sha256=_Gd1dtDSLaw8o-o0JugzSKMt9FpeXewTh4wGEaUd4VQ,2571
-ddi_fw-0.0.188.dist-info/METADATA,sha256=SRAoTA4fu0suxghXx5okr-RsfC512VEotrkTCUeXBck,2542
-ddi_fw-0.0.188.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-ddi_fw-0.0.188.dist-info/top_level.txt,sha256=PMwHICFZTZtcpzQNPV4UQnfNXYIeLR_Ste-Wfc1h810,7
-ddi_fw-0.0.188.dist-info/RECORD,,
+ddi_fw-0.0.190.dist-info/METADATA,sha256=kTsCriMdtxc5BZWLUlThWAMPoYSWjPRkLFZntodwCwM,2542
+ddi_fw-0.0.190.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ddi_fw-0.0.190.dist-info/top_level.txt,sha256=PMwHICFZTZtcpzQNPV4UQnfNXYIeLR_Ste-Wfc1h810,7
+ddi_fw-0.0.190.dist-info/RECORD,,