ddi-fw 0.0.102__py3-none-any.whl → 0.0.104__py3-none-any.whl

ddi_fw/langchain/embeddings.py

@@ -92,6 +92,7 @@ class SBertEmbeddings(BaseModel, Embeddings):
     #     arbitrary_types_allowed = True
 
     model_config = ConfigDict(
+        extra="allow",
         arbitrary_types_allowed = True,
         protected_namespaces=()
     )

ddi_fw/langchain/storage.py

@@ -12,6 +12,7 @@ from langchain.document_loaders import DataFrameLoader
 from langchain.text_splitter import TextSplitter
 
 # from langchain_community.document_loaders.hugging_face_dataset import HuggingFaceDatasetLoader
+from ddi_fw.langchain.embeddings import SBertEmbeddings
 from ddi_fw.utils import get_import
 
 
@@ -134,8 +135,10 @@ def generate_embeddings(df, config_file, new_model_names, collections=None, pers
 
         # Assuming the classes for the embeddings and splitters are available
         try:
+            model_kwargs = collection_config['model_kwargs']
+            SBertEmbeddings(model_name="a", model_config={})
             model = get_import(embedding_model_type)(
-                model_name=name, model_kwargs=collection_config['model_kwargs'])
+                model_name=name, **model_kwargs)
         except:
             # print(f"Unknown embedding model: {embedding_model_type}")
             raise Exception(f"Unknown embedding model: {embedding_model_type}")
@@ -144,12 +147,12 @@ def generate_embeddings(df, config_file, new_model_names, collections=None, pers
         text_splitters_suffixes = []
         for text_splitter_type in text_splitters_types:
             try:
-                type_of_text_splitter = get_import(text_splitter_type)
-                text_splitter_params = text_splitter.get("params")
-                suffix = text_splitter.get("suffix")
-                if text_splitter_params:
+                type_of_text_splitter = get_import(text_splitter_type.get("type"))
+                kwargs = text_splitter_type.get("params")
+                suffix = text_splitter_type.get("suffix")
+                if kwargs:
                     text_splitter = type_of_text_splitter(
-                        **text_splitter_params)
+                        **kwargs)
                 else:
                     text_splitter = type_of_text_splitter()
                 text_splitters.append(text_splitter)

{ddi_fw-0.0.102.dist-info → ddi_fw-0.0.104.dist-info}/METADATA

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

{ddi_fw-0.0.102.dist-info → ddi_fw-0.0.104.dist-info}/RECORD

@@ -56,9 +56,9 @@ ddi_fw/drugbank/drugbank_processor.py,sha256=vmkt68n9nFLevufgGyXhOSDtTo4G1XzwT9P
 ddi_fw/drugbank/drugbank_processor_org.py,sha256=eO5Yset50P91qkic79RUXPoEuxRxQKFkKW0l4G29Mas,13322
 ddi_fw/drugbank/event_extractor.py,sha256=6odoZohhK7OdLF-LF0l-5BFq0_NMG_5jrFJbHrBXsI8,4600
 ddi_fw/langchain/__init__.py,sha256=zS0CQrakWEP19biSRewFJGcBT8WBZq4899HrEKiMqUY,269
-ddi_fw/langchain/embeddings.py,sha256=b9BUG73Ayx3Wy8MQrfsVeZ-qBB41vjVECSp2YhH-CIY,7514
+ddi_fw/langchain/embeddings.py,sha256=lU64a5AZ62jP8U3hTSwK0kXt7gThbwPACLfJMZ1baPA,7538
 ddi_fw/langchain/sentence_splitter.py,sha256=h_bYElx4Ud1mwDNJfL7mUwvgadwKX3GKlSzu5L2PXzg,280
-ddi_fw/langchain/storage.py,sha256=CDJuUSvUlUgHL8gKb3bo4RHLtI6gY8N2sNyJXg4TBJQ,7432
+ddi_fw/langchain/storage.py,sha256=Swxh5mSFAb6q1R2ZHgYy89OC3iSKtVoKjRNJERYoJCA,7561
 ddi_fw/ml/__init__.py,sha256=tIxiW0g6q1VsmDYVXR_ovvHQR3SCir8g2bKxx_CrS7s,221
 ddi_fw/ml/evaluation_helper.py,sha256=o4-w5Xa3t4olLW4ymx_8L-Buhe5wfQEmT2bh4Zz544c,13066
 ddi_fw/ml/ml_helper.py,sha256=fySjIAFzkeEOvaLJhDwtCOgRhgYQ7H106eqaP16GhDY,4489
@@ -91,7 +91,7 @@ ddi_fw/utils/package_helper.py,sha256=erl8_onmhK-41zQoaED2qyDUV9GQxmT9sdoyRp9_q5
 ddi_fw/utils/py7zr_helper.py,sha256=gOqaFIyJvTjUM-btO2x9AQ69jZOS8PoKN0wetYIckJw,4747
 ddi_fw/utils/utils.py,sha256=szwnxMTDRrZoeNRyDuf3aCbtzriwtaRk4mHSH3asLdA,4301
 ddi_fw/utils/zip_helper.py,sha256=YRZA4tKZVBJwGQM0_WK6L-y5MoqkKoC-nXuuHK6CU9I,5567
-ddi_fw-0.0.102.dist-info/METADATA,sha256=f8-pfgayNvtlcMCO9E-e4Mza4QEddI417SO60XbdwMo,1967
-ddi_fw-0.0.102.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-ddi_fw-0.0.102.dist-info/top_level.txt,sha256=PMwHICFZTZtcpzQNPV4UQnfNXYIeLR_Ste-Wfc1h810,7
-ddi_fw-0.0.102.dist-info/RECORD,,
+ddi_fw-0.0.104.dist-info/METADATA,sha256=yWmrr5MurOmnjfKPsZtSpY7hyO0ejmuovv_Om09VJiM,1967
+ddi_fw-0.0.104.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+ddi_fw-0.0.104.dist-info/top_level.txt,sha256=PMwHICFZTZtcpzQNPV4UQnfNXYIeLR_Ste-Wfc1h810,7
+ddi_fw-0.0.104.dist-info/RECORD,,