Feature/fix zerox ingestion (#1659)

* fix zerox ing * up * rm cruft * fix bugs * fix llm formatting for rag reply
SciPhi-AI · Dec 5, 2024 · 01659ea · 01659ea
1 parent e407e87
commit 01659ea
Show file tree

Hide file tree

Showing 13 changed files with 257 additions and 92 deletions.
diff --git a/py/core/base/providers/orchestration.py b/py/core/base/providers/orchestration.py
@@ -14,8 +14,8 @@ class OrchestrationConfig(ProviderConfig):
     provider: str
     max_runs: int = 2_048
     kg_creation_concurrency_limit: int = 32
-    ingestion_concurrency_limit: int = 64
-    kg_enrichment_concurrency_limit: int = 8
+    ingestion_concurrency_limit: int = 16
+    kg_concurrency_limit: int = 4
 
     def validate_config(self) -> None:
         if self.provider not in self.supported_providers:

diff --git a/py/core/configs/full.toml b/py/core/configs/full.toml
@@ -1,17 +1,21 @@
+[completion]
+provider = "litellm"
+concurrent_request_limit = 128
+
 [ingestion]
 provider = "unstructured_local"
 strategy = "auto"
 chunking_strategy = "by_title"
-new_after_n_chars = 512
-max_characters = 1_024
-combine_under_n_chars = 128
-overlap = 256
+new_after_n_chars = 2_048
+max_characters = 4_096
+combine_under_n_chars = 1_024
+overlap = 1_024
 
     [ingestion.extra_parsers]
     pdf = "zerox"
 
 [orchestration]
 provider = "hatchet"
-kg_creation_concurrency_lipmit = 32
-ingestion_concurrency_limit = 128
-kg_enrichment_concurrency_limit = 8
+kg_creation_concurrency_limit = 32
+ingestion_concurrency_limit = 16
+kg_concurrency_limit = 8
diff --git a/py/core/configs/full_azure.toml b/py/core/configs/full_azure.toml
@@ -1,5 +1,8 @@
 # A config which overrides all instances of `openai` with `azure` in the `r2r.toml` config
 [completion]
+provider = "litellm"
+concurrent_request_limit = 128
+
   [completion.generation_config]
   model = "azure/gpt-4o"
 
@@ -25,6 +28,7 @@ batch_size = 256
 [embedding]
 provider = "litellm"
 base_model = "azure/text-embedding-3-small"
+base_dimension = 512
 
 [file]
 provider = "postgres"
@@ -33,10 +37,10 @@ provider = "postgres"
 provider = "unstructured_local"
 strategy = "auto"
 chunking_strategy = "by_title"
-new_after_n_chars = 512
-max_characters = 1_024
-combine_under_n_chars = 128
-overlap = 256
+new_after_n_chars = 2_048
+max_characters = 4_096
+combine_under_n_chars = 1_024
+overlap = 1_024
 document_summary_model = "azure/gpt-4o-mini"
 vision_img_model = "azure/gpt-4o"
 vision_pdf_model = "azure/gpt-4o"
@@ -49,6 +53,6 @@ vision_pdf_model = "azure/gpt-4o"
 
 [orchestration]
 provider = "hatchet"
-kg_creation_concurrency_lipmit = 32
-ingestion_concurrency_limit = 128
-kg_enrichment_concurrency_limit = 8
+kg_creation_concurrency_limit = 32
+ingestion_concurrency_limit = 4
+kg_concurrency_limit = 8
diff --git a/py/core/configs/r2r_azure.toml b/py/core/configs/r2r_azure.toml
@@ -24,7 +24,8 @@ batch_size = 256
 
 [embedding]
 provider = "litellm"
-base_model = "openai/text-embedding-3-small" # continue with `openai` for embeddings, due to server rate limit on azure
+base_model = "azure/text-embedding-3-small" # continue with `openai` for embeddings, due to server rate limit on azure
+base_dimension = 512
 
 [file]
 provider = "postgres"

diff --git a/py/core/main/api/v3/retrieval_router.py b/py/core/main/api/v3/retrieval_router.py
@@ -104,7 +104,7 @@ def _setup_routes(self):
                                     filters: {"document_id": {"$eq": "3e157b3a-8469-51db-90d9-52e7d896b49b"}},
                                     use_semantic_search: true,
                                     chunk_settings: {
-                                        limit: 20, // separate limit for chunk vs. graph
+                                        limit: 20, # separate limit for chunk vs. graph
                                         enabled: true
                                     },
                                     graph_settings: {
@@ -130,7 +130,7 @@ def _setup_routes(self):
                                         filters: {"document_id": {"$eq": "3e157b3a-8469-51db-90d9-52e7d896b49b"}},
                                         use_semantic_search: true,
                                         chunk_settings: {
-                                            limit: 20, // separate limit for chunk vs. graph
+                                            limit: 20, # separate limit for chunk vs. graph
                                             enabled: true
                                         },
                                         graph_settings: {
@@ -165,7 +165,7 @@ def _setup_routes(self):
                                     filters: {"document_id": {"$eq": "3e157b3a-8469-51db-90d9-52e7d896b49b"}},
                                     use_semantic_search: true,
                                     chunk_settings: {
-                                        limit: 20, // separate limit for chunk vs. graph
+                                        limit: 20, # separate limit for chunk vs. graph
                                         enabled: true
                                     },
                                     graph_settings: {
@@ -261,7 +261,7 @@ async def search_app(
                                         filters: {"document_id": {"$eq": "3e157b3a-8469-51db-90d9-52e7d896b49b"}},
                                         use_semantic_search: true,
                                         chunk_settings: {
-                                            limit: 20, // separate limit for chunk vs. graph
+                                            limit: 20, # separate limit for chunk vs. graph
                                             enabled: true
                                         },
                                         graph_settings: {
@@ -435,7 +435,7 @@ async def stream_generator():
                                         filters: {"document_id": {"$eq": "3e157b3a-8469-51db-90d9-52e7d896b49b"}},
                                         use_semantic_search: true,
                                         chunk_settings: {
-                                            limit: 20, // separate limit for chunk vs. graph
+                                            limit: 20, # separate limit for chunk vs. graph
                                             enabled: true
                                         },
                                         graph_settings: {

diff --git a/py/core/main/orchestration/hatchet/ingestion_workflow.py b/py/core/main/orchestration/hatchet/ingestion_workflow.py
@@ -56,7 +56,7 @@ def concurrency(self, context: Context) -> str:
             except Exception as e:
                 return str(uuid.uuid4())
 
-        @orchestration_provider.step(timeout="60m")
+        @orchestration_provider.step(retries=0, timeout="60m")
         async def parse(self, context: Context) -> dict:
             try:
                 logger.info("Initiating ingestion workflow, step: parse")