ddi-fw 0.0.184__py3-none-any.whl → 0.0.186__py3-none-any.whl

ddi_fw/ml/ml_helper.py

@@ -32,7 +32,7 @@ import ddi_fw.utils as utils
 
 class MultiModalRunner:
     # todo model related parameters to config
-    def __init__(self, library, multi_modal, use_mlflow=True):
+    def __init__(self, library, multi_modal, use_mlflow=False):
         self.library = library
         self.multi_modal = multi_modal
         self.use_mlflow = use_mlflow
@@ -99,8 +99,8 @@ class MultiModalRunner:
     def predict(self, combinations: list = [], generate_combinations=False):
         self.prefix = utils.utc_time_as_string()
         self.date = utils.utc_time_as_string_simple_format()
-        sum = np.zeros(
-            (self.y_test_label.shape[0], self.y_test_label.shape[1]))
+        # sum = np.zeros(
+        #     (self.y_test_label.shape[0], self.y_test_label.shape[1]))
         single_results = dict()
 
         if generate_combinations:

ddi_fw/ml/tensorflow_wrapper.py

@@ -120,7 +120,7 @@ class TFModelWrapper(ModelWrapper):
         print(self.train_data.shape)
         models = {}
         models_val_acc = {}
-        if self.train_idx_arr is not None and self.val_idx_arr is not None:
+        if self.train_idx_arr and self.val_idx_arr:
             for i, (train_idx, val_idx) in enumerate(zip(self.train_idx_arr, self.val_idx_arr)):
                 print(f"Validation {i}")
 
@@ -155,7 +155,8 @@ class TFModelWrapper(ModelWrapper):
                     self.train_data, self.train_label, None, None)
                 models[self.descriptor] = model
                 models_val_acc[self.descriptor] = checkpoint.best
-
+        if models_val_acc == {}:
+            return model, None
         best_model_key = max(models_val_acc, key=lambda k: models_val_acc[k])
         # best_model_key = max(models_val_acc, key=models_val_acc.get)
         best_model = models[best_model_key]

ddi_fw/pipeline/ner_pipeline.py

@@ -106,7 +106,7 @@ class NerParameterSearch:
                     **kwargs)
 
                 # train_idx_arr, val_idx_arr  bir kez hesaplanması yeterli aslında
-                X_train, X_test, y_train, y_test, X_train.index, X_test.index, train_idx_arr, val_idx_arr = dataset.load()
+                dataset.load()
                 group_items = dataset.produce_inputs()
                 for item in group_items:
                     # item[0] = f'threshold_{threshold}_{item[0]}'
@@ -115,8 +115,8 @@ class NerParameterSearch:
 
                 self.items.extend(group_items)
         self.y_test_label = self.items[0][4]
-        self.train_idx_arr = train_idx_arr
-        self.val_idx_arr = val_idx_arr
+        self.train_idx_arr = dataset.train_idx_arr
+        self.val_idx_arr = dataset.val_idx_arr
 
     def run(self, model_func, batch_size=128, epochs=100):
         mlflow.set_tracking_uri(self.tracking_uri)

ddi_fw/pipeline/pipeline.py

@@ -244,7 +244,7 @@ class Pipeline(BaseModel):
 
         y_test_label = self.items[0][4]
         multi_modal_runner = MultiModalRunner(
-            library=self.library, multi_modal=self.multi_modal)
+            library=self.library, multi_modal=self.multi_modal, use_mlflow=self.use_mlflow)
         # multi_modal_runner = MultiModalRunner(
         #     library=self.library, model_func=model_func, batch_size=batch_size,  epochs=epochs)
         # multi_modal = TFMultiModal(

{ddi_fw-0.0.184.dist-info → ddi_fw-0.0.186.dist-info}/METADATA

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

{ddi_fw-0.0.184.dist-info → ddi_fw-0.0.186.dist-info}/RECORD

@@ -74,18 +74,18 @@ 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=E6ef7f1UnQl6JBUdGDbbbI4FIS-904VGypT7tI0a598,8545
+ddi_fw/ml/ml_helper.py,sha256=MSxdr3UpS5qFJN7TWdXDaNwBfYjzMXp7cHs2PWTpX6o,8550
 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=xX_rP6nzB2yQiNvGP9_PbbQt1bXiPPWEozIzpbV6Ens,12911
+ddi_fw/ml/tensorflow_wrapper.py,sha256=-zcbd0LBg9QNMF9K1I-JC379cS3rTO7ibgsDIOnMsoc,12951
 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
 ddi_fw/pipeline/__init__.py,sha256=tKDM_rW4vPjlYTeOkNgi9PujDzb4e9O3LK1w5wqnebw,212
 ddi_fw/pipeline/multi_modal_combination_strategy.py,sha256=JSyuP71b1I1yuk0s2ecCJZTtCED85jBtkpwTUxibJvI,1706
 ddi_fw/pipeline/multi_pipeline.py,sha256=NfcH4Ze5U-JRiH3lrxEDWj-VPxYQYtp7tq6bLCImBzs,5550
-ddi_fw/pipeline/ner_pipeline.py,sha256=kNGtkg5rNX5MDywzvRxmvyk-DxXAjEbYzZkp8pNlAZo,6023
-ddi_fw/pipeline/pipeline.py,sha256=11CgBgNxzo1KqKWudezSM2iFruoUVG-JMNbwznvt1KA,11362
+ddi_fw/pipeline/ner_pipeline.py,sha256=Bp6BA6nozfWFaMHH6jKlzesnCGO6qiMkzdGy_ed6nh0,5947
+ddi_fw/pipeline/pipeline.py,sha256=uMpkZnqEzH5rQDkgySdDKPzfMKfXNyO0QCsFVKUfrJ4,11390
 ddi_fw/utils/__init__.py,sha256=bqIC0YjbD0YSHtO0nWUkRs4w5nu7qBV0yU72sRzwCj8,475
 ddi_fw/utils/categorical_data_encoding_checker.py,sha256=gzb_vUDBrCMUhBxY1fBYTe8hmK72p0_uw3DTga8cqP8,1580
 ddi_fw/utils/enums.py,sha256=19eJ3fX5eRK_xPvkYcukmug144jXPH4X9zQqtsFBj5A,671
@@ -98,7 +98,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.184.dist-info/METADATA,sha256=LcArDcKH55AW1jIEGnnhpZsyPyH63fWrzfSrnQKHTOk,2542
-ddi_fw-0.0.184.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-ddi_fw-0.0.184.dist-info/top_level.txt,sha256=PMwHICFZTZtcpzQNPV4UQnfNXYIeLR_Ste-Wfc1h810,7
-ddi_fw-0.0.184.dist-info/RECORD,,
+ddi_fw-0.0.186.dist-info/METADATA,sha256=a8oR_ifI2j--Lmx1432hOdmHWwDvXI-j-fJ-301IWVE,2542
+ddi_fw-0.0.186.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ddi_fw-0.0.186.dist-info/top_level.txt,sha256=PMwHICFZTZtcpzQNPV4UQnfNXYIeLR_Ste-Wfc1h810,7
+ddi_fw-0.0.186.dist-info/RECORD,,