ddi-fw 0.0.211__py3-none-any.whl → 0.0.213__py3-none-any.whl

ddi_fw/ml/ml_helper.py

@@ -156,6 +156,7 @@ class MultiModalRunner:
             (self.y_test_label.shape[0], self.y_test_label.shape[1]))
         for item in combination:
             prediction = prediction + single_results[item]
+        prediction = np.argmax(prediction, axis=1)
         logs, metrics = evaluate(
             actual=self.y_test_label, pred=prediction, info=combination_descriptor)
         if self.use_mlflow:

ddi_fw/ml/tensorflow_wrapper.py

@@ -183,11 +183,11 @@ class TFModelWrapper(ModelWrapper):
                 actual = self.test_label
                 # if not utils.is_binary_encoded(pred):
                 #     pred = tf.keras.utils.to_categorical(np.argmax(pred,axis=1), num_classes=self.num_classes)
-                pred= convert_to_categorical(pred, self.num_classes)
-                actual= convert_to_categorical(actual, self.num_classes)
+                pred_as_cat= convert_to_categorical(pred, self.num_classes)
+                actual_as_cat= convert_to_categorical(actual, self.num_classes)
 
                 logs, metrics = evaluate(
-                    actual=actual, pred=pred, info=self.descriptor, print_detail=print_detail)
+                    actual=actual_as_cat, pred=pred_as_cat, info=self.descriptor, print_detail=print_detail)
                 metrics.format_float()
                 mlflow.log_metrics(logs)
                 mlflow.log_param('best_cv', best_model_key)

ddi_fw/pipeline/pipeline.py

@@ -126,14 +126,14 @@ class Pipeline(BaseModel):
                 kwargs[k] = v
         
 
-        self.ner_df = CTakesNER(df=None).load(
+        ner_df = CTakesNER(df=None).load(
             filename=self.ner_data_file) if self.ner_data_file else None
 
         dataset_splitter = self.dataset_splitter_type()
         pooling_strategy = self.embedding_pooling_strategy_type(
             ) if self.embedding_pooling_strategy_type else None   
         if issubclass(self.dataset_type, TextDatasetMixin):
-            kwargs["ner_df"] = self.ner_df
+            kwargs["ner_df"] = ner_df
             dataset = self.dataset_type(
                 embedding_dict=self.embedding_dict, 
                 pooling_strategy=pooling_strategy,

{ddi_fw-0.0.211.dist-info → ddi_fw-0.0.213.dist-info}/METADATA

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

{ddi_fw-0.0.211.dist-info → ddi_fw-0.0.213.dist-info}/RECORD

@@ -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=xacnXmS8wB28F4CR3c274VaeHUB2d_KO15dYnO0gRzE,7658
+ddi_fw/ml/ml_helper.py,sha256=m6_yoZwkKgYh0RRlXExfBaE63H_UgeFOXW9Dzy1kVig,7710
 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
+ddi_fw/ml/tensorflow_wrapper.py,sha256=Vw6M2rHDHV90jzfCr0XWpUqYVl4vmZeKsS7FUb3VkH4,12980
 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
@@ -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=SZFJ9QSPD_3mcG9NHZOtMqKyNvyWrodsdsLryMyDdUw,8686
 ddi_fw/pipeline/ner_pipeline.py,sha256=Bp6BA6nozfWFaMHH6jKlzesnCGO6qiMkzdGy_ed6nh0,5947
-ddi_fw/pipeline/pipeline.py,sha256=_sRzMyxGSJo4GhM8ZJhxwvMvKsqFa1WSSECpx4SgdDw,9181
+ddi_fw/pipeline/pipeline.py,sha256=YhUBVLC29ZD2tmVd0e8X1FVBLhSKECZL2OP57oEW6HE,9171
 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
@@ -99,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=EBf-XAiwQwr68az91erEYNegfeqssBR29kVgrliIyac,4765
 ddi_fw/vectorization/idf_helper.py,sha256=_Gd1dtDSLaw8o-o0JugzSKMt9FpeXewTh4wGEaUd4VQ,2571
-ddi_fw-0.0.211.dist-info/METADATA,sha256=HO-fzXxm5AGnMMB8S0hnkOtH18bvaanoIAJgLOCP8gk,2631
-ddi_fw-0.0.211.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-ddi_fw-0.0.211.dist-info/top_level.txt,sha256=PMwHICFZTZtcpzQNPV4UQnfNXYIeLR_Ste-Wfc1h810,7
-ddi_fw-0.0.211.dist-info/RECORD,,
+ddi_fw-0.0.213.dist-info/METADATA,sha256=BjGWPBaTzKY--kJGul2QSnf5Sd96hVdwIlMJzDPE9Eo,2631
+ddi_fw-0.0.213.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ddi_fw-0.0.213.dist-info/top_level.txt,sha256=PMwHICFZTZtcpzQNPV4UQnfNXYIeLR_Ste-Wfc1h810,7
+ddi_fw-0.0.213.dist-info/RECORD,,