ddi-fw 0.0.188__tar.gz → 0.0.190__tar.gz

{ddi_fw-0.0.188 → ddi_fw-0.0.190}/PKG-INFO

@@ -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 → ddi_fw-0.0.190}/pyproject.toml

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

{ddi_fw-0.0.188 → ddi_fw-0.0.190}/src/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-0.0.188 → ddi_fw-0.0.190}/src/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-0.0.188 → ddi_fw-0.0.190}/src/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-0.0.188 → ddi_fw-0.0.190}/src/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-0.0.190/src/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 → ddi_fw-0.0.190}/src/ddi_fw.egg-info/PKG-INFO

@@ -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 → ddi_fw-0.0.190}/src/ddi_fw.egg-info/SOURCES.txt

@@ -98,6 +98,7 @@ src/ddi_fw/utils/categorical_data_encoding_checker.py
 src/ddi_fw/utils/enums.py
 src/ddi_fw/utils/json_helper.py
 src/ddi_fw/utils/kaggle.py
+src/ddi_fw/utils/numpy_utils.py
 src/ddi_fw/utils/package_helper.py
 src/ddi_fw/utils/py7zr_helper.py
 src/ddi_fw/utils/utils.py