LLM-Driven Extraction of Unstructured Data — Built for API Deployments & ETL Pipeline Workflows
Python ai-agentsdata-engineeringdocument-aigenerative-aiidpjson-extractionllmmcp-serverocrpdf-extractionprompt-engineeringstructured-output
[FIX] Cost calculation fix for LLMs and Embeddings (#502)
Deepak K4889e2c83c23
diff --git a/backend/pdm.lock b/backend/pdm.lockindex 4b896fa3e..99b61f0dd 100644--- a/backend/pdm.lock+++ b/backend/pdm.lock@@ -5,7 +5,7 @@groups = ["default", "deploy", "dev", "test"]strategy = ["cross_platform", "inherit_metadata"]lock_version = "4.4.1"-content_hash = "sha256:833399304360347050cb95f45e62bcb0977b835e9e1087689c248e0e281c5958"+content_hash = "sha256:96ad51e58ce516613f5a392048e30039e99b1e1fa59cba46ca199d1fa578b87b"[[package]]name = "adlfs"@@ -409,7 +409,7 @@ files = [[[package]]name = "azure-storage-blob"-version = "12.20.0"+version = "12.21.0"requires_python = ">=3.8"summary = "Microsoft Azure Blob Storage Client Library for Python"groups = ["default", "dev"]@@ -420,8 +420,8 @@ dependencies = ["typing-extensions>=4.6.0",]files = [- {file = "azure-storage-blob-12.20.0.tar.gz", hash = "sha256:eeb91256e41d4b5b9bad6a87fd0a8ade07dd58aa52344e2c8d2746e27a017d3b"},- {file = "azure_storage_blob-12.20.0-py3-none-any.whl", hash = "sha256:de6b3bf3a90e9341a6bcb96a2ebe981dffff993e9045818f6549afea827a52a9"},+ {file = "azure-storage-blob-12.21.0.tar.gz", hash = "sha256:b9722725072f5b7373c0f4dd6d78fbae2bb37bffc5c3e01731ab8c750ee8dd7e"},+ {file = "azure_storage_blob-12.21.0-py3-none-any.whl", hash = "sha256:f9ede187dd5a0ef296b583a7c1861c6938ddd6708d6e70f4203a163c2ab42d43"},][[package]]@@ -1862,7 +1862,7 @@ files = [[[package]]name = "huggingface-hub"-version = "0.23.5"+version = "0.24.0"requires_python = ">=3.8.0"summary = "Client library to download and publish models, datasets and other repos on the huggingface.co hub"groups = ["default", "dev"]@@ -1876,8 +1876,8 @@ dependencies = ["typing-extensions>=3.7.4.3",]files = [- {file = "huggingface_hub-0.23.5-py3-none-any.whl", hash = "sha256:d7a7d337615e11a45cc14a0ce5a605db6b038dc24af42866f731684825226e90"},- {file = "huggingface_hub-0.23.5.tar.gz", hash = "sha256:67a9caba79b71235be3752852ca27da86bd54311d2424ca8afdb8dda056edf98"},+ {file = "huggingface_hub-0.24.0-py3-none-any.whl", hash = "sha256:7ad92edefb93d8145c061f6df8d99df2ff85f8379ba5fac8a95aca0642afa5d7"},+ {file = "huggingface_hub-0.24.0.tar.gz", hash = "sha256:6c7092736b577d89d57b3cdfea026f1b0dc2234ae783fa0d59caf1bf7d52dfa7"},][[package]]@@ -2292,7 +2292,7 @@ files = [[[package]]name = "llama-index-llms-openai"-version = "0.1.25"+version = "0.1.26"requires_python = "<4.0,>=3.8.1"summary = "llama-index llms openai integration"groups = ["default", "dev"]@@ -2300,8 +2300,8 @@ dependencies = ["llama-index-core<0.11.0,>=0.10.24",]files = [- {file = "llama_index_llms_openai-0.1.25-py3-none-any.whl", hash = "sha256:d1922ad2f2bb4697a6ee2f61793aeb2f5c5606302639559dd9bb0a1d6ab9e73f"},- {file = "llama_index_llms_openai-0.1.25.tar.gz", hash = "sha256:49750f71d58e762a597ce639a2ccb119195c47aefa8a48c55c77be8a5cec4bc5"},+ {file = "llama_index_llms_openai-0.1.26-py3-none-any.whl", hash = "sha256:1ad8e4eb02f9410c2091749d4d9aa9db4452646b595eb5eb937edbc496fb65fe"},+ {file = "llama_index_llms_openai-0.1.26.tar.gz", hash = "sha256:08a408cd53af4cd4623dd5807be4cbbd5e5b3ca01272128cd678d667343e4d5d"},][[package]]@@ -2351,7 +2351,7 @@ files = [[[package]]name = "llama-index-multi-modal-llms-openai"-version = "0.1.7"+version = "0.1.8"requires_python = "<4.0,>=3.8.1"summary = "llama-index multi-modal-llms openai integration"groups = ["default", "dev"]@@ -2360,7 +2360,8 @@ dependencies = ["llama-index-llms-openai<0.2.0,>=0.1.1",]files = [- {file = "llama_index_multi_modal_llms_openai-0.1.7-py3-none-any.whl", hash = "sha256:a86fa4a8f8372da31b978cc28d14da75ce6a39f42b1eea90cd3ac93017644766"},+ {file = "llama_index_multi_modal_llms_openai-0.1.8-py3-none-any.whl", hash = "sha256:16ae72ac3c5201ebd1d4b62203930c1768149ec85c3e477e5e51ed2ef8db1067"},+ {file = "llama_index_multi_modal_llms_openai-0.1.8.tar.gz", hash = "sha256:5e2c94a6415a2509cad035ccea34461959ae327a5900d3e820417e9ebb9a13ec"},][[package]]@@ -2584,7 +2585,7 @@ files = [[[package]]name = "msal"-version = "1.29.0"+version = "1.30.0"requires_python = ">=3.7"summary = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect."groups = ["default", "dev"]@@ -2594,8 +2595,8 @@ dependencies = ["requests<3,>=2.0.0",]files = [- {file = "msal-1.29.0-py3-none-any.whl", hash = "sha256:6b301e63f967481f0cc1a3a3bac0cf322b276855bc1b0955468d9deb3f33d511"},- {file = "msal-1.29.0.tar.gz", hash = "sha256:8f6725f099752553f9b2fe84125e2a5ebe47b49f92eacca33ebedd3a9ebaae25"},+ {file = "msal-1.30.0-py3-none-any.whl", hash = "sha256:423872177410cb61683566dc3932db7a76f661a5d2f6f52f02a047f101e1c1de"},+ {file = "msal-1.30.0.tar.gz", hash = "sha256:b4bf00850092e465157d814efa24a18f788284c9a479491024d62903085ea2fb"},][[package]]@@ -4006,13 +4007,13 @@ files = [[[package]]name = "setuptools"-version = "70.3.0"+version = "71.0.3"requires_python = ">=3.8"summary = "Easily download, build, install, upgrade, and uninstall Python packages"groups = ["default", "dev"]files = [- {file = "setuptools-70.3.0-py3-none-any.whl", hash = "sha256:fe384da74336c398e0d956d1cae0669bc02eed936cdb1d49b57de1990dc11ffc"},- {file = "setuptools-70.3.0.tar.gz", hash = "sha256:f171bab1dfbc86b132997f26a119f6056a57950d058587841a0082e8830f9dc5"},+ {file = "setuptools-71.0.3-py3-none-any.whl", hash = "sha256:f501b6e6db709818dc76882582d9c516bf3b67b948864c5fa1d1624c09a49207"},+ {file = "setuptools-71.0.3.tar.gz", hash = "sha256:3d8531791a27056f4a38cd3e54084d8b1c4228ff9cf3f2d7dd075ec99f9fd70d"},][[package]]@@ -4633,7 +4634,7 @@ files = [[[package]]name = "unstract-adapters"-version = "0.21.0"+version = "0.22.0"requires_python = "<3.12,>=3.9"summary = "Unstract interface for LLMs, Embeddings and VectorDBs"groups = ["default", "dev"]@@ -4662,8 +4663,8 @@ dependencies = ["singleton-decorator~=1.0.0",]files = [- {file = "unstract_adapters-0.21.0-py3-none-any.whl", hash = "sha256:6c4f597602f55b80ba176a29a930755abd3494ff1c085f406536e7463902d655"},- {file = "unstract_adapters-0.21.0.tar.gz", hash = "sha256:ebb8f80b7f26f04874bb5466fe0be8c3e1b51d44ed85c4e62289a7751c996af6"},+ {file = "unstract_adapters-0.22.0-py3-none-any.whl", hash = "sha256:0c0c4fe262ee1e3c98858ac4911c9c5accad52f92d7408e5eddef958168f786f"},+ {file = "unstract_adapters-0.22.0.tar.gz", hash = "sha256:f8ca322a1ec50e0fe257b1bb4ad6da4f6f5ca3016114437fe9119fe374e3a44b"},][[package]]@@ -4725,7 +4726,7 @@ dependencies = [[[package]]name = "unstract-sdk"-version = "0.37.0"+version = "0.38.0"requires_python = "<3.11.1,>=3.9"summary = "A framework for writing Unstract Tools/Apps"groups = ["default"]@@ -4737,11 +4738,11 @@ dependencies = ["python-magic~=0.4.27","tiktoken~=0.4.0","transformers==4.37.0",- "unstract-adapters~=0.21.0",+ "unstract-adapters~=0.22.0",]files = [- {file = "unstract_sdk-0.37.0-py3-none-any.whl", hash = "sha256:3bd83dfb7a760e73f35cc9ed4bdadf645bd77f03f77d25578e842156645e6f1d"},- {file = "unstract_sdk-0.37.0.tar.gz", hash = "sha256:a00b81f014508db0130dd21d594e3d8e0034dcafd3f01461ce30d37e68646944"},+ {file = "unstract_sdk-0.38.0-py3-none-any.whl", hash = "sha256:846343de9a55ca5a3b83a75fa85d7792f4bb4131703fb88127c6782684fa7fec"},+ {file = "unstract_sdk-0.38.0.tar.gz", hash = "sha256:8b39f5cc06d179abcc4267762e65180cf18b3b7af2ecd9c7266ac3f030995ae0"},][[package]]@@ -4756,7 +4757,7 @@ dependencies = ["PyYAML~=6.0.1","docker~=6.1.3","jsonschema~=4.18.2",- "unstract-adapters~=0.21.0",+ "unstract-adapters~=0.22.0","unstract-tool-sandbox",]diff --git a/backend/pyproject.toml b/backend/pyproject.tomlindex 5b454b5a5..71a38d77f 100644--- a/backend/pyproject.toml+++ b/backend/pyproject.toml@@ -31,8 +31,8 @@ dependencies = ["python-socketio==5.9.0", # For log_events"social-auth-app-django==5.3.0", # For OAuth"social-auth-core==4.4.2", # For OAuth- "unstract-sdk~=0.37.0",- "unstract-adapters~=0.21.0",+ "unstract-sdk~=0.38.0",+ "unstract-adapters~=0.22.0",# ! IMPORTANT!# Indirect local dependencies usually need to be added in their own projects# as: https://pdm-project.org/latest/usage/dependency/#local-dependencies.diff --git a/backend/sample.env b/backend/sample.envindex 2cca7fc19..f605c45b6 100644--- a/backend/sample.env+++ b/backend/sample.env@@ -90,9 +90,9 @@ PROMPT_STUDIO_FILE_PATH=/app/prompt-studio-data# Structure Tool Image (Runs prompt studio exported tools)# https://hub.docker.com/r/unstract/tool-structure-STRUCTURE_TOOL_IMAGE_URL="docker:unstract/tool-structure:0.0.30"+STRUCTURE_TOOL_IMAGE_URL="docker:unstract/tool-structure:0.0.31"STRUCTURE_TOOL_IMAGE_NAME="unstract/tool-structure"-STRUCTURE_TOOL_IMAGE_TAG="0.0.30"+STRUCTURE_TOOL_IMAGE_TAG="0.0.31"# Feature FlagsEVALUATION_SERVER_IP=unstract-fliptdiff --git a/pdm.lock b/pdm.lockindex 5d9a4249b..9317bb64d 100644--- a/pdm.lock+++ b/pdm.lock@@ -5,7 +5,7 @@groups = ["default", "hook-check-django-migrations", "lint"]strategy = ["cross_platform", "inherit_metadata"]lock_version = "4.4.1"-content_hash = "sha256:7fc9eb36dac2b7ddc12c6fc922c31a6947ad533bef97332413b5f78095b3fe50"+content_hash = "sha256:57c2cf633d13bb685cf8863c278780496786d3f71588dd45ffc31a99c311871d"[[package]]name = "adlfs"@@ -386,7 +386,7 @@ files = [[[package]]name = "azure-storage-blob"-version = "12.20.0"+version = "12.21.0"requires_python = ">=3.8"summary = "Microsoft Azure Blob Storage Client Library for Python"groups = ["hook-check-django-migrations"]@@ -397,8 +397,8 @@ dependencies = ["typing-extensions>=4.6.0",]files = [- {file = "azure-storage-blob-12.20.0.tar.gz", hash = "sha256:eeb91256e41d4b5b9bad6a87fd0a8ade07dd58aa52344e2c8d2746e27a017d3b"},- {file = "azure_storage_blob-12.20.0-py3-none-any.whl", hash = "sha256:de6b3bf3a90e9341a6bcb96a2ebe981dffff993e9045818f6549afea827a52a9"},+ {file = "azure-storage-blob-12.21.0.tar.gz", hash = "sha256:b9722725072f5b7373c0f4dd6d78fbae2bb37bffc5c3e01731ab8c750ee8dd7e"},+ {file = "azure_storage_blob-12.21.0-py3-none-any.whl", hash = "sha256:f9ede187dd5a0ef296b583a7c1861c6938ddd6708d6e70f4203a163c2ab42d43"},][[package]]@@ -540,13 +540,13 @@ files = [[[package]]name = "cachetools"-version = "5.3.3"+version = "5.4.0"requires_python = ">=3.7"summary = "Extensible memoizing collections and decorators"groups = ["hook-check-django-migrations"]files = [- {file = "cachetools-5.3.3-py3-none-any.whl", hash = "sha256:0abad1021d3f8325b2fc1d2e9c8b9c9d57b04c3932657a72465447332c24d945"},- {file = "cachetools-5.3.3.tar.gz", hash = "sha256:ba29e2dfa0b8b556606f097407ed1aa62080ee108ab0dc5ec9d6a723a007d105"},+ {file = "cachetools-5.4.0-py3-none-any.whl", hash = "sha256:3ae3b49a3d5e28a77a0be2b37dbcb89005058959cb2323858c2657c4a8cab474"},+ {file = "cachetools-5.4.0.tar.gz", hash = "sha256:b8adc2e7c07f105ced7bc56dbb6dfbe7c4a00acce20e2227b3f355be89bc6827"},][[package]]@@ -1070,7 +1070,7 @@ files = [[[package]]name = "dropboxdrivefs"-version = "1.3.1"+version = "1.4.1"requires_python = ">=3.5"summary = "Dropbox implementation for fsspec module"groups = ["hook-check-django-migrations"]@@ -1080,7 +1080,7 @@ dependencies = ["requests",]files = [- {file = "dropboxdrivefs-1.3.1.tar.gz", hash = "sha256:892ee9017c59648736d79c3989cadb9e129b469fcec0c68d12e42bd6826a962d"},+ {file = "dropboxdrivefs-1.4.1.tar.gz", hash = "sha256:6f3c6061d045813553ce91ed0e2b682f1d70bec74011943c92b3181faacefd34"},][[package]]@@ -1100,14 +1100,14 @@ files = [[[package]]name = "exceptiongroup"-version = "1.2.1"+version = "1.2.2"requires_python = ">=3.7"summary = "Backport of PEP 654 (exception groups)"groups = ["hook-check-django-migrations"]marker = "python_version < \"3.11\""files = [- {file = "exceptiongroup-1.2.1-py3-none-any.whl", hash = "sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad"},- {file = "exceptiongroup-1.2.1.tar.gz", hash = "sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16"},+ {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"},+ {file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"},][[package]]@@ -1313,7 +1313,7 @@ files = [[[package]]name = "google-api-python-client"-version = "2.136.0"+version = "2.137.0"requires_python = ">=3.7"summary = "Google API Client Library for Python"groups = ["hook-check-django-migrations"]@@ -1325,8 +1325,8 @@ dependencies = ["uritemplate<5,>=3.0.1",]files = [- {file = "google-api-python-client-2.136.0.tar.gz", hash = "sha256:161c722c8864e7ed39393e2b7eea76ef4e1c933a6a59f9d7c70409b6635f225d"},- {file = "google_api_python_client-2.136.0-py2.py3-none-any.whl", hash = "sha256:5a554c8b5edf0a609b905d89d7ced82e8f6ac31da1e4d8d5684ef63dbc0e49f5"},+ {file = "google_api_python_client-2.137.0-py2.py3-none-any.whl", hash = "sha256:a8b5c5724885e5be9f5368739aa0ccf416627da4ebd914b410a090c18f84d692"},+ {file = "google_api_python_client-2.137.0.tar.gz", hash = "sha256:e739cb74aac8258b1886cb853b0722d47c81fe07ad649d7f2206f06530513c04"},][[package]]@@ -1378,7 +1378,7 @@ files = [[[package]]name = "google-cloud-aiplatform"-version = "1.58.0"+version = "1.59.0"requires_python = ">=3.8"summary = "Vertex AI API client library"groups = ["hook-check-django-migrations"]@@ -1390,14 +1390,14 @@ dependencies = ["google-cloud-resource-manager<3.0.0dev,>=1.3.3","google-cloud-storage<3.0.0dev,>=1.32.0","packaging>=14.3",- "proto-plus<2.0.0dev,>=1.22.0",+ "proto-plus<2.0.0dev,>=1.22.3","protobuf!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<5.0.0dev,>=3.19.5","pydantic<3","shapely<3.0.0dev",]files = [- {file = "google-cloud-aiplatform-1.58.0.tar.gz", hash = "sha256:7a05aceac4a6c7eaa26e684e9f202b829cc7e57f82bffe7281684275a553fcad"},- {file = "google_cloud_aiplatform-1.58.0-py2.py3-none-any.whl", hash = "sha256:21f1320860f4916183ec939fdf2ff3fc1d7fdde97fe5795974257ab21f9458ec"},+ {file = "google-cloud-aiplatform-1.59.0.tar.gz", hash = "sha256:2bebb59c0ba3e3b4b568305418ca1b021977988adbee8691a5bed09b037e7e63"},+ {file = "google_cloud_aiplatform-1.59.0-py2.py3-none-any.whl", hash = "sha256:549e6eb1844b0f853043309138ebe2db00de4bbd8197b3bde26804ac163ef52a"},][[package]]@@ -1862,7 +1862,7 @@ files = [[[package]]name = "huggingface-hub"-version = "0.23.4"+version = "0.24.0"requires_python = ">=3.8.0"summary = "Client library to download and publish models, datasets and other repos on the huggingface.co hub"groups = ["hook-check-django-migrations"]@@ -1876,8 +1876,8 @@ dependencies = ["typing-extensions>=3.7.4.3",]files = [- {file = "huggingface_hub-0.23.4-py3-none-any.whl", hash = "sha256:3a0b957aa87150addf0cc7bd71b4d954b78e749850e1e7fb29ebbd2db64ca037"},- {file = "huggingface_hub-0.23.4.tar.gz", hash = "sha256:35d99016433900e44ae7efe1c209164a5a81dbbcd53a52f99c281dcd7ce22431"},+ {file = "huggingface_hub-0.24.0-py3-none-any.whl", hash = "sha256:7ad92edefb93d8145c061f6df8d99df2ff85f8379ba5fac8a95aca0642afa5d7"},+ {file = "huggingface_hub-0.24.0.tar.gz", hash = "sha256:6c7092736b577d89d57b3cdfea026f1b0dc2234ae783fa0d59caf1bf7d52dfa7"},][[package]]@@ -2017,21 +2017,6 @@ files = [{file = "kombu-5.3.7.tar.gz", hash = "sha256:011c4cd9a355c14a1de8d35d257314a1d2456d52b7140388561acac3cf1a97bf"},]-[[package]]-name = "llama-cloud"-version = "0.0.6"-requires_python = "<4,>=3.8"-summary = ""-groups = ["hook-check-django-migrations"]-dependencies = [- "httpx>=0.20.0",- "pydantic>=1.10",-]-files = [- {file = "llama_cloud-0.0.6-py3-none-any.whl", hash = "sha256:0f07c8a865be632b543dec2bcad350a68a61f13413a7421b4b03de32c36f0194"},- {file = "llama_cloud-0.0.6.tar.gz", hash = "sha256:33b94cd119133dcb2899c9b69e8e1c36aec7bc7e80062c55c65f15618722e091"},-]-[[package]]name = "llama-index"version = "0.10.38"@@ -2091,7 +2076,7 @@ files = [[[package]]name = "llama-index-core"-version = "0.10.53.post1"+version = "0.10.55"requires_python = "<4.0,>=3.8.1"summary = "Interface between LLMs and your data"groups = ["hook-check-django-migrations"]@@ -2104,7 +2089,6 @@ dependencies = ["dirtyjson<2.0.0,>=1.0.8","fsspec>=2023.5.0","httpx",- "llama-cloud<0.0.7,>=0.0.6","nest-asyncio<2.0.0,>=1.5.8","networkx>=3.0","nltk<4.0.0,>=3.8.1",@@ -2121,8 +2105,8 @@ dependencies = ["wrapt",]files = [- {file = "llama_index_core-0.10.53.post1-py3-none-any.whl", hash = "sha256:565d0967dd8f05456c66f5aca6ee6ee3dbc5645b6a55c81957f776ff029d6a99"},- {file = "llama_index_core-0.10.53.post1.tar.gz", hash = "sha256:6219a737b66c887b406814b0d9db6e24addd35f3136ffb6a879e54ac3f133406"},+ {file = "llama_index_core-0.10.55-py3-none-any.whl", hash = "sha256:e2f7dbc9c992d4487dabad6a7b0f40ed145cce0ab99e52cc78e9caf0cd4c1c08"},+ {file = "llama_index_core-0.10.55.tar.gz", hash = "sha256:b02d46595c17805221a8f404c04a97609d1ce22e5be24ad7b7c4ac30e5181561"},][[package]]@@ -2308,7 +2292,7 @@ files = [[[package]]name = "llama-index-llms-openai"-version = "0.1.25"+version = "0.1.26"requires_python = "<4.0,>=3.8.1"summary = "llama-index llms openai integration"groups = ["hook-check-django-migrations"]@@ -2316,8 +2300,8 @@ dependencies = ["llama-index-core<0.11.0,>=0.10.24",]files = [- {file = "llama_index_llms_openai-0.1.25-py3-none-any.whl", hash = "sha256:d1922ad2f2bb4697a6ee2f61793aeb2f5c5606302639559dd9bb0a1d6ab9e73f"},- {file = "llama_index_llms_openai-0.1.25.tar.gz", hash = "sha256:49750f71d58e762a597ce639a2ccb119195c47aefa8a48c55c77be8a5cec4bc5"},+ {file = "llama_index_llms_openai-0.1.26-py3-none-any.whl", hash = "sha256:1ad8e4eb02f9410c2091749d4d9aa9db4452646b595eb5eb937edbc496fb65fe"},+ {file = "llama_index_llms_openai-0.1.26.tar.gz", hash = "sha256:08a408cd53af4cd4623dd5807be4cbbd5e5b3ca01272128cd678d667343e4d5d"},][[package]]@@ -2367,7 +2351,7 @@ files = [[[package]]name = "llama-index-multi-modal-llms-openai"-version = "0.1.7"+version = "0.1.8"requires_python = "<4.0,>=3.8.1"summary = "llama-index multi-modal-llms openai integration"groups = ["hook-check-django-migrations"]@@ -2376,7 +2360,8 @@ dependencies = ["llama-index-llms-openai<0.2.0,>=0.1.1",]files = [- {file = "llama_index_multi_modal_llms_openai-0.1.7-py3-none-any.whl", hash = "sha256:a86fa4a8f8372da31b978cc28d14da75ce6a39f42b1eea90cd3ac93017644766"},+ {file = "llama_index_multi_modal_llms_openai-0.1.8-py3-none-any.whl", hash = "sha256:16ae72ac3c5201ebd1d4b62203930c1768149ec85c3e477e5e51ed2ef8db1067"},+ {file = "llama_index_multi_modal_llms_openai-0.1.8.tar.gz", hash = "sha256:5e2c94a6415a2509cad035ccea34461959ae327a5900d3e820417e9ebb9a13ec"},][[package]]@@ -2413,7 +2398,7 @@ files = [[[package]]name = "llama-index-readers-file"-version = "0.1.29"+version = "0.1.30"requires_python = "<4.0,>=3.8.1"summary = "llama-index readers file integration"groups = ["hook-check-django-migrations"]@@ -2424,8 +2409,8 @@ dependencies = ["striprtf<0.0.27,>=0.0.26",]files = [- {file = "llama_index_readers_file-0.1.29-py3-none-any.whl", hash = "sha256:b25f3dbf7bf3e0635290e499e808db5ba955eab67f205a3ff1cea6a4eb93556a"},- {file = "llama_index_readers_file-0.1.29.tar.gz", hash = "sha256:f9f696e738383e7d14078e75958fba5a7030f7994a20586e3140e1ca41395a54"},+ {file = "llama_index_readers_file-0.1.30-py3-none-any.whl", hash = "sha256:d5f6cdd4685ee73103c68b9bc0dfb0d05439033133fc6bd45ef31ff41519e723"},+ {file = "llama_index_readers_file-0.1.30.tar.gz", hash = "sha256:32f40465f2a8a65fa5773e03c9f4dd55164be934ae67fad62113680436787d91"},][[package]]@@ -2611,7 +2596,7 @@ files = [[[package]]name = "msal"-version = "1.29.0"+version = "1.30.0"requires_python = ">=3.7"summary = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect."groups = ["hook-check-django-migrations"]@@ -2621,8 +2606,8 @@ dependencies = ["requests<3,>=2.0.0",]files = [- {file = "msal-1.29.0-py3-none-any.whl", hash = "sha256:6b301e63f967481f0cc1a3a3bac0cf322b276855bc1b0955468d9deb3f33d511"},- {file = "msal-1.29.0.tar.gz", hash = "sha256:8f6725f099752553f9b2fe84125e2a5ebe47b49f92eacca33ebedd3a9ebaae25"},+ {file = "msal-1.30.0-py3-none-any.whl", hash = "sha256:423872177410cb61683566dc3932db7a76f661a5d2f6f52f02a047f101e1c1de"},+ {file = "msal-1.30.0.tar.gz", hash = "sha256:b4bf00850092e465157d814efa24a18f788284c9a479491024d62903085ea2fb"},][[package]]@@ -3080,7 +3065,7 @@ files = [[[package]]name = "portalocker"-version = "2.10.0"+version = "2.10.1"requires_python = ">=3.8"summary = "Wraps the portalocker recipe for easy usage"groups = ["hook-check-django-migrations"]@@ -3088,8 +3073,8 @@ dependencies = ["pywin32>=226; platform_system == \"Windows\"",]files = [- {file = "portalocker-2.10.0-py3-none-any.whl", hash = "sha256:48944147b2cd42520549bc1bb8fe44e220296e56f7c3d551bc6ecce69d9b0de1"},- {file = "portalocker-2.10.0.tar.gz", hash = "sha256:49de8bc0a2f68ca98bf9e219c81a3e6b27097c7bf505a87c5a112ce1aaeb9b81"},+ {file = "portalocker-2.10.1-py3-none-any.whl", hash = "sha256:53a5984ebc86a025552264b459b46a2086e269b21823cb572f8f28ee759e45bf"},+ {file = "portalocker-2.10.1.tar.gz", hash = "sha256:ef1bf844e878ab08aee7e40184156e1151f228f103aa5c6bd0724cc330960f8f"},][[package]]@@ -3521,7 +3506,7 @@ files = [[[package]]name = "pypdf"-version = "4.2.0"+version = "4.3.0"requires_python = ">=3.6"summary = "A pure-python PDF library capable of splitting, merging, cropping, and transforming PDF files"groups = ["hook-check-django-migrations"]@@ -3529,8 +3514,8 @@ dependencies = ["typing-extensions>=4.0; python_version < \"3.11\"",]files = [- {file = "pypdf-4.2.0-py3-none-any.whl", hash = "sha256:dc035581664e0ad717e3492acebc1a5fc23dba759e788e3d4a9fc9b1a32e72c1"},- {file = "pypdf-4.2.0.tar.gz", hash = "sha256:fe63f3f7d1dcda1c9374421a94c1bba6c6f8c4a62173a59b64ffd52058f846b1"},+ {file = "pypdf-4.3.0-py3-none-any.whl", hash = "sha256:eeea4d019b57c099d02a0e1692eaaab23341ae3f255c1dafa3c8566b4636496d"},+ {file = "pypdf-4.3.0.tar.gz", hash = "sha256:0d7a4c67fd03782f5a09d3f48c11c7a31e0bb9af78861a25229bb49259ed0504"},][[package]]@@ -4024,18 +4009,18 @@ files = [[[package]]name = "setuptools"-version = "70.2.0"+version = "71.0.3"requires_python = ">=3.8"summary = "Easily download, build, install, upgrade, and uninstall Python packages"groups = ["hook-check-django-migrations"]files = [- {file = "setuptools-70.2.0-py3-none-any.whl", hash = "sha256:b8b8060bb426838fbe942479c90296ce976249451118ef566a5a0b7d8b78fb05"},- {file = "setuptools-70.2.0.tar.gz", hash = "sha256:bd63e505105011b25c3c11f753f7e3b8465ea739efddaccef8f0efac2137bac1"},+ {file = "setuptools-71.0.3-py3-none-any.whl", hash = "sha256:f501b6e6db709818dc76882582d9c516bf3b67b948864c5fa1d1624c09a49207"},+ {file = "setuptools-71.0.3.tar.gz", hash = "sha256:3d8531791a27056f4a38cd3e54084d8b1c4228ff9cf3f2d7dd075ec99f9fd70d"},][[package]]name = "shapely"-version = "2.0.4"+version = "2.0.5"requires_python = ">=3.7"summary = "Manipulation and analysis of geometric objects"groups = ["hook-check-django-migrations"]@@ -4043,28 +4028,25 @@ dependencies = ["numpy<3,>=1.14",]files = [- {file = "shapely-2.0.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:011b77153906030b795791f2fdfa2d68f1a8d7e40bce78b029782ade3afe4f2f"},- {file = "shapely-2.0.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9831816a5d34d5170aa9ed32a64982c3d6f4332e7ecfe62dc97767e163cb0b17"},- {file = "shapely-2.0.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5c4849916f71dc44e19ed370421518c0d86cf73b26e8656192fcfcda08218fbd"},- {file = "shapely-2.0.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:841f93a0e31e4c64d62ea570d81c35de0f6cea224568b2430d832967536308e6"},- {file = "shapely-2.0.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b4431f522b277c79c34b65da128029a9955e4481462cbf7ebec23aab61fc58"},- {file = "shapely-2.0.4-cp310-cp310-win32.whl", hash = "sha256:92a41d936f7d6743f343be265ace93b7c57f5b231e21b9605716f5a47c2879e7"},- {file = "shapely-2.0.4-cp310-cp310-win_amd64.whl", hash = "sha256:30982f79f21bb0ff7d7d4a4e531e3fcaa39b778584c2ce81a147f95be1cd58c9"},- {file = "shapely-2.0.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:de0205cb21ad5ddaef607cda9a3191eadd1e7a62a756ea3a356369675230ac35"},- {file = "shapely-2.0.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:7d56ce3e2a6a556b59a288771cf9d091470116867e578bebced8bfc4147fbfd7"},- {file = "shapely-2.0.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:58b0ecc505bbe49a99551eea3f2e8a9b3b24b3edd2a4de1ac0dc17bc75c9ec07"},- {file = "shapely-2.0.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:790a168a808bd00ee42786b8ba883307c0e3684ebb292e0e20009588c426da47"},- {file = "shapely-2.0.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4310b5494271e18580d61022c0857eb85d30510d88606fa3b8314790df7f367d"},- {file = "shapely-2.0.4-cp311-cp311-win32.whl", hash = "sha256:63f3a80daf4f867bd80f5c97fbe03314348ac1b3b70fb1c0ad255a69e3749879"},- {file = "shapely-2.0.4-cp311-cp311-win_amd64.whl", hash = "sha256:c52ed79f683f721b69a10fb9e3d940a468203f5054927215586c5d49a072de8d"},- {file = "shapely-2.0.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:3f9103abd1678cb1b5f7e8e1af565a652e036844166c91ec031eeb25c5ca8af0"},- {file = "shapely-2.0.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:263bcf0c24d7a57c80991e64ab57cba7a3906e31d2e21b455f493d4aab534aaa"},- {file = "shapely-2.0.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ddf4a9bfaac643e62702ed662afc36f6abed2a88a21270e891038f9a19bc08fc"},- {file = "shapely-2.0.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:485246fcdb93336105c29a5cfbff8a226949db37b7473c89caa26c9bae52a242"},- {file = "shapely-2.0.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8de4578e838a9409b5b134a18ee820730e507b2d21700c14b71a2b0757396acc"},- {file = "shapely-2.0.4-cp39-cp39-win32.whl", hash = "sha256:9dab4c98acfb5fb85f5a20548b5c0abe9b163ad3525ee28822ffecb5c40e724c"},- {file = "shapely-2.0.4-cp39-cp39-win_amd64.whl", hash = "sha256:31c19a668b5a1eadab82ff070b5a260478ac6ddad3a5b62295095174a8d26398"},- {file = "shapely-2.0.4.tar.gz", hash = "sha256:5dc736127fac70009b8d309a0eeb74f3e08979e530cf7017f2f507ef62e6cfb8"},+ {file = "shapely-2.0.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:89d34787c44f77a7d37d55ae821f3a784fa33592b9d217a45053a93ade899375"},+ {file = "shapely-2.0.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:798090b426142df2c5258779c1d8d5734ec6942f778dab6c6c30cfe7f3bf64ff"},+ {file = "shapely-2.0.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:45211276900c4790d6bfc6105cbf1030742da67594ea4161a9ce6812a6721e68"},+ {file = "shapely-2.0.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e119444bc27ca33e786772b81760f2028d930ac55dafe9bc50ef538b794a8e1"},+ {file = "shapely-2.0.5-cp310-cp310-win32.whl", hash = "sha256:9a4492a2b2ccbeaebf181e7310d2dfff4fdd505aef59d6cb0f217607cb042fb3"},+ {file = "shapely-2.0.5-cp310-cp310-win_amd64.whl", hash = "sha256:1e5cb5ee72f1bc7ace737c9ecd30dc174a5295fae412972d3879bac2e82c8fae"},+ {file = "shapely-2.0.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5bbfb048a74cf273db9091ff3155d373020852805a37dfc846ab71dde4be93ec"},+ {file = "shapely-2.0.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:93be600cbe2fbaa86c8eb70656369f2f7104cd231f0d6585c7d0aa555d6878b8"},+ {file = "shapely-2.0.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f8e71bb9a46814019f6644c4e2560a09d44b80100e46e371578f35eaaa9da1c"},+ {file = "shapely-2.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5251c28a29012e92de01d2e84f11637eb1d48184ee8f22e2df6c8c578d26760"},+ {file = "shapely-2.0.5-cp311-cp311-win32.whl", hash = "sha256:35110e80070d664781ec7955c7de557456b25727a0257b354830abb759bf8311"},+ {file = "shapely-2.0.5-cp311-cp311-win_amd64.whl", hash = "sha256:6c6b78c0007a34ce7144f98b7418800e0a6a5d9a762f2244b00ea560525290c9"},+ {file = "shapely-2.0.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7545a39c55cad1562be302d74c74586f79e07b592df8ada56b79a209731c0219"},+ {file = "shapely-2.0.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4c83a36f12ec8dee2066946d98d4d841ab6512a6ed7eb742e026a64854019b5f"},+ {file = "shapely-2.0.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:89e640c2cd37378480caf2eeda9a51be64201f01f786d127e78eaeff091ec897"},+ {file = "shapely-2.0.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:06efe39beafde3a18a21dde169d32f315c57da962826a6d7d22630025200c5e6"},+ {file = "shapely-2.0.5-cp39-cp39-win32.whl", hash = "sha256:8203a8b2d44dcb366becbc8c3d553670320e4acf0616c39e218c9561dd738d92"},+ {file = "shapely-2.0.5-cp39-cp39-win_amd64.whl", hash = "sha256:7fed9dbfbcfec2682d9a047b9699db8dcc890dfca857ecba872c42185fc9e64e"},+ {file = "shapely-2.0.5.tar.gz", hash = "sha256:bff2366bc786bfa6cb353d6b47d0443c570c32776612e527ee47b6df63fcfe32"},][[package]]@@ -4310,13 +4292,13 @@ files = [[[package]]name = "sqlparse"-version = "0.5.0"+version = "0.5.1"requires_python = ">=3.8"summary = "A non-validating SQL parser."groups = ["hook-check-django-migrations"]files = [- {file = "sqlparse-0.5.0-py3-none-any.whl", hash = "sha256:c204494cd97479d0e39f28c93d46c0b2d5959c7b9ab904762ea6c7af211c8663"},- {file = "sqlparse-0.5.0.tar.gz", hash = "sha256:714d0a4932c059d16189f58ef5411ec2287a4360f17cdd0edd2d09d4c5087c93"},+ {file = "sqlparse-0.5.1-py3-none-any.whl", hash = "sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4"},+ {file = "sqlparse-0.5.1.tar.gz", hash = "sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e"},][[package]]@@ -4479,13 +4461,13 @@ files = [[[package]]name = "tomlkit"-version = "0.12.5"-requires_python = ">=3.7"+version = "0.13.0"+requires_python = ">=3.8"summary = "Style preserving TOML library"groups = ["hook-check-django-migrations"]files = [- {file = "tomlkit-0.12.5-py3-none-any.whl", hash = "sha256:af914f5a9c59ed9d0762c7b64d3b5d5df007448eb9cd2edc8a46b1eafead172f"},- {file = "tomlkit-0.12.5.tar.gz", hash = "sha256:eef34fba39834d4d6b73c9ba7f3e4d1c417a4e56f89a7e96e090dd0d24b8fb3c"},+ {file = "tomlkit-0.13.0-py3-none-any.whl", hash = "sha256:7075d3042d03b80f603482d69bf0c8f345c2b30e41699fd8883227f89972b264"},+ {file = "tomlkit-0.13.0.tar.gz", hash = "sha256:08ad192699734149f5b97b45f1f18dad7eb1b6d16bc72ad0c2335772650d7b72"},][[package]]@@ -4618,13 +4600,13 @@ files = [[[package]]name = "types-setuptools"-version = "70.2.0.20240704"+version = "70.3.0.20240710"requires_python = ">=3.8"summary = "Typing stubs for setuptools"groups = ["lint"]files = [- {file = "types-setuptools-70.2.0.20240704.tar.gz", hash = "sha256:2f8d28d16ca1607080f9fdf19595bd49c942884b2bbd6529c9b8a9a8fc8db911"},- {file = "types_setuptools-70.2.0.20240704-py3-none-any.whl", hash = "sha256:6b892d5441c2ed58dd255724516e3df1db54892fb20597599aea66d04c3e4d7f"},+ {file = "types-setuptools-70.3.0.20240710.tar.gz", hash = "sha256:842cbf399812d2b65042c9d6ff35113bbf282dee38794779aa1f94e597bafc35"},+ {file = "types_setuptools-70.3.0.20240710-py3-none-any.whl", hash = "sha256:bd0db2a4b9f2c49ac5564be4e0fb3125c4c46b1f73eafdcbceffa5b005cceca4"},][[package]]@@ -4746,7 +4728,7 @@ files = [[[package]]name = "unstract-adapters"-version = "0.21.0"+version = "0.22.0"requires_python = "<3.12,>=3.9"summary = "Unstract interface for LLMs, Embeddings and VectorDBs"groups = ["hook-check-django-migrations"]@@ -4775,8 +4757,8 @@ dependencies = ["singleton-decorator~=1.0.0",]files = [- {file = "unstract_adapters-0.21.0-py3-none-any.whl", hash = "sha256:6c4f597602f55b80ba176a29a930755abd3494ff1c085f406536e7463902d655"},- {file = "unstract_adapters-0.21.0.tar.gz", hash = "sha256:ebb8f80b7f26f04874bb5466fe0be8c3e1b51d44ed85c4e62289a7751c996af6"},+ {file = "unstract_adapters-0.22.0-py3-none-any.whl", hash = "sha256:0c0c4fe262ee1e3c98858ac4911c9c5accad52f92d7408e5eddef958168f786f"},+ {file = "unstract_adapters-0.22.0.tar.gz", hash = "sha256:f8ca322a1ec50e0fe257b1bb4ad6da4f6f5ca3016114437fe9119fe374e3a44b"},][[package]]@@ -4792,7 +4774,7 @@ dependencies = ["PyMySQL==1.1.0","adlfs==2023.8.0","boxfs==0.2.1",- "dropboxdrivefs==1.3.1",+ "dropboxdrivefs==1.4.1","gcsfs==2023.6.0","google-auth==2.20.0","google-cloud-bigquery==3.11.4",@@ -4838,44 +4820,23 @@ dependencies = [[[package]]name = "unstract-sdk"-version = "0.37.0"+version = "0.38.0"requires_python = "<3.11.1,>=3.9"summary = "A framework for writing Unstract Tools/Apps"groups = ["hook-check-django-migrations"]dependencies = [- "filetype~=1.2.0",- "httpx>=0.25.2","jsonschema~=4.18.2",- "llama-index-embeddings-azure-openai==0.1.6",- "llama-index-embeddings-azure-openai==0.1.6",- "llama-index-embeddings-google==0.1.5",- "llama-index-embeddings-ollama==0.1.2",- "llama-index-llms-anthropic==0.1.11",- "llama-index-llms-anyscale==0.1.3",- "llama-index-llms-azure-openai==0.1.5",- "llama-index-llms-mistralai==0.1.10",- "llama-index-llms-ollama==0.1.3",- "llama-index-llms-palm==0.1.5",- "llama-index-llms-replicate==0.1.3",- "llama-index-llms-vertex==0.1.8",- "llama-index-vector-stores-milvus==0.1.18",- "llama-index-vector-stores-pinecone==0.1.4",- "llama-index-vector-stores-postgres==0.1.3",- "llama-index-vector-stores-qdrant==0.2.8",- "llama-index-vector-stores-weaviate==0.1.4",- "llama-index==0.10.38","llama-index==0.10.38",- "llama-parse==0.4.1","openai~=1.21.2","python-dotenv==1.0.0","python-magic~=0.4.27",- "singleton-decorator~=1.0.0","tiktoken~=0.4.0","transformers==4.37.0",+ "unstract-adapters~=0.22.0",]files = [- {file = "unstract_sdk-0.37.0-py3-none-any.whl", hash = "sha256:3bd83dfb7a760e73f35cc9ed4bdadf645bd77f03f77d25578e842156645e6f1d"},- {file = "unstract_sdk-0.37.0.tar.gz", hash = "sha256:a00b81f014508db0130dd21d594e3d8e0034dcafd3f01461ce30d37e68646944"},+ {file = "unstract_sdk-0.38.0-py3-none-any.whl", hash = "sha256:846343de9a55ca5a3b83a75fa85d7792f4bb4131703fb88127c6782684fa7fec"},+ {file = "unstract_sdk-0.38.0.tar.gz", hash = "sha256:8b39f5cc06d179abcc4267762e65180cf18b3b7af2ecd9c7266ac3f030995ae0"},][[package]]@@ -4890,7 +4851,7 @@ dependencies = ["PyYAML~=6.0.1","docker~=6.1.3","jsonschema~=4.18.2",- "unstract-adapters~=0.21.0",+ "unstract-adapters~=0.22.0","unstract-tool-sandbox",]@@ -4944,13 +4905,13 @@ files = [[[package]]name = "validators"-version = "0.31.0"+version = "0.33.0"requires_python = ">=3.8"summary = "Python Data Validation for Humans™"groups = ["hook-check-django-migrations"]files = [- {file = "validators-0.31.0-py3-none-any.whl", hash = "sha256:e15a600d81555a4cd409b17bf55946c5edec7748e776afc85ed0a19bdee54e56"},- {file = "validators-0.31.0.tar.gz", hash = "sha256:de7574fc56a231c788162f3e7da15bc2053c5ff9e0281d9ff1afb3a7b69498df"},+ {file = "validators-0.33.0-py3-none-any.whl", hash = "sha256:134b586a98894f8139865953899fc2daeb3d0c35569552c5518f089ae43ed075"},+ {file = "validators-0.33.0.tar.gz", hash = "sha256:535867e9617f0100e676a1257ba1e206b9bfd847ddc171e4d44811f07ff0bfbf"},][[package]]diff --git a/platform-service/src/unstract/platform_service/helper.py b/platform-service/src/unstract/platform_service/helper.pyindex 30b6ed335..2fa739dbe 100644--- a/platform-service/src/unstract/platform_service/helper.py+++ b/platform-service/src/unstract/platform_service/helper.py@@ -109,12 +109,19 @@ class CostCalculationHelper:self.file_path = file_pathself.logger = logger- def calculate_cost(self, model_name, input_tokens, output_tokens):+ def calculate_cost(self, model_name, provider, input_tokens, output_tokens):cost = 0.0item = Nonemodel_prices = self._get_model_prices()- if model_prices:- item = model_prices.get(model_name)+ # Filter the model objects by model name+ filtered_models = {+ k: v for k, v in model_prices.items() if k.endswith(model_name)+ }+ # Check if the lite llm provider starts with the given provider+ for _, model_info in filtered_models.items():+ if provider in model_info.get("litellm_provider", ""):+ item = model_info+ breakif item:input_cost_per_token = item.get("input_cost_per_token", 0)output_cost_per_token = item.get("output_cost_per_token", 0)diff --git a/platform-service/src/unstract/platform_service/main.py b/platform-service/src/unstract/platform_service/main.pyindex 9eb7fe233..a309aa5db 100644--- a/platform-service/src/unstract/platform_service/main.py+++ b/platform-service/src/unstract/platform_service/main.py@@ -214,6 +214,7 @@ def usage() -> Any:usage_type = payload.get("usage_type", "")llm_usage_reason = payload.get("llm_usage_reason", "")model_name = payload.get("model_name", "")+ provider = payload.get("provider", "")embedding_tokens = payload.get("embedding_tokens", 0)prompt_tokens = payload.get("prompt_tokens", 0)completion_tokens = payload.get("completion_tokens", 0)@@ -221,11 +222,14 @@ def usage() -> Any:input_tokens = prompt_tokensif usage_type == "embedding":input_tokens = embedding_tokens- cost_in_dollars = cost_calculation_helper.calculate_cost(- model_name=model_name,- input_tokens=input_tokens,- output_tokens=completion_tokens,- )+ cost_in_dollars = 0.0+ if provider:+ cost_in_dollars = cost_calculation_helper.calculate_cost(+ model_name=model_name,+ provider=provider,+ input_tokens=input_tokens,+ output_tokens=completion_tokens,+ )usage_id = uuid.uuid4()current_time = datetime.now()if check_feature_flag_status(FeatureFlag.MULTI_TENANCY_V2):diff --git a/prompt-service/pdm.lock b/prompt-service/pdm.lockindex 10ca43356..b6ec66d6c 100644--- a/prompt-service/pdm.lock+++ b/prompt-service/pdm.lock@@ -5,7 +5,7 @@groups = ["default", "deploy"]strategy = ["cross_platform", "inherit_metadata"]lock_version = "4.4.1"-content_hash = "sha256:eaae1bf94459b78457fae0f31ee40ffe16501f871011be927463fdc5f929f40c"+content_hash = "sha256:059df4346a457999151e8fc12b9cd74a2968ac6a57928a8d58f4f4fa4df67c87"[[package]]name = "aiohttp"@@ -314,13 +314,13 @@ files = [[[package]]name = "cachetools"-version = "5.3.3"+version = "5.4.0"requires_python = ">=3.7"summary = "Extensible memoizing collections and decorators"groups = ["default"]files = [- {file = "cachetools-5.3.3-py3-none-any.whl", hash = "sha256:0abad1021d3f8325b2fc1d2e9c8b9c9d57b04c3932657a72465447332c24d945"},- {file = "cachetools-5.3.3.tar.gz", hash = "sha256:ba29e2dfa0b8b556606f097407ed1aa62080ee108ab0dc5ec9d6a723a007d105"},+ {file = "cachetools-5.4.0-py3-none-any.whl", hash = "sha256:3ae3b49a3d5e28a77a0be2b37dbcb89005058959cb2323858c2657c4a8cab474"},+ {file = "cachetools-5.4.0.tar.gz", hash = "sha256:b8adc2e7c07f105ced7bc56dbb6dfbe7c4a00acce20e2227b3f355be89bc6827"},][[package]]@@ -585,14 +585,14 @@ files = [[[package]]name = "exceptiongroup"-version = "1.2.1"+version = "1.2.2"requires_python = ">=3.7"summary = "Backport of PEP 654 (exception groups)"groups = ["default"]marker = "python_version < \"3.11\""files = [- {file = "exceptiongroup-1.2.1-py3-none-any.whl", hash = "sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad"},- {file = "exceptiongroup-1.2.1.tar.gz", hash = "sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16"},+ {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"},+ {file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"},][[package]]@@ -1237,7 +1237,7 @@ files = [[[package]]name = "huggingface-hub"-version = "0.23.4"+version = "0.24.0"requires_python = ">=3.8.0"summary = "Client library to download and publish models, datasets and other repos on the huggingface.co hub"groups = ["default"]@@ -1251,8 +1251,8 @@ dependencies = ["typing-extensions>=3.7.4.3",]files = [- {file = "huggingface_hub-0.23.4-py3-none-any.whl", hash = "sha256:3a0b957aa87150addf0cc7bd71b4d954b78e749850e1e7fb29ebbd2db64ca037"},- {file = "huggingface_hub-0.23.4.tar.gz", hash = "sha256:35d99016433900e44ae7efe1c209164a5a81dbbcd53a52f99c281dcd7ce22431"},+ {file = "huggingface_hub-0.24.0-py3-none-any.whl", hash = "sha256:7ad92edefb93d8145c061f6df8d99df2ff85f8379ba5fac8a95aca0642afa5d7"},+ {file = "huggingface_hub-0.24.0.tar.gz", hash = "sha256:6c7092736b577d89d57b3cdfea026f1b0dc2234ae783fa0d59caf1bf7d52dfa7"},][[package]]@@ -1386,21 +1386,6 @@ files = [{file = "kombu-5.3.7.tar.gz", hash = "sha256:011c4cd9a355c14a1de8d35d257314a1d2456d52b7140388561acac3cf1a97bf"},]-[[package]]-name = "llama-cloud"-version = "0.0.6"-requires_python = "<4,>=3.8"-summary = ""-groups = ["default"]-dependencies = [- "httpx>=0.20.0",- "pydantic>=1.10",-]-files = [- {file = "llama_cloud-0.0.6-py3-none-any.whl", hash = "sha256:0f07c8a865be632b543dec2bcad350a68a61f13413a7421b4b03de32c36f0194"},- {file = "llama_cloud-0.0.6.tar.gz", hash = "sha256:33b94cd119133dcb2899c9b69e8e1c36aec7bc7e80062c55c65f15618722e091"},-]-[[package]]name = "llama-index"version = "0.10.38"@@ -1460,7 +1445,7 @@ files = [[[package]]name = "llama-index-core"-version = "0.10.53.post1"+version = "0.10.55"requires_python = "<4.0,>=3.8.1"summary = "Interface between LLMs and your data"groups = ["default"]@@ -1473,7 +1458,6 @@ dependencies = ["dirtyjson<2.0.0,>=1.0.8","fsspec>=2023.5.0","httpx",- "llama-cloud<0.0.7,>=0.0.6","nest-asyncio<2.0.0,>=1.5.8","networkx>=3.0","nltk<4.0.0,>=3.8.1",@@ -1490,8 +1474,8 @@ dependencies = ["wrapt",]files = [- {file = "llama_index_core-0.10.53.post1-py3-none-any.whl", hash = "sha256:565d0967dd8f05456c66f5aca6ee6ee3dbc5645b6a55c81957f776ff029d6a99"},- {file = "llama_index_core-0.10.53.post1.tar.gz", hash = "sha256:6219a737b66c887b406814b0d9db6e24addd35f3136ffb6a879e54ac3f133406"},+ {file = "llama_index_core-0.10.55-py3-none-any.whl", hash = "sha256:e2f7dbc9c992d4487dabad6a7b0f40ed145cce0ab99e52cc78e9caf0cd4c1c08"},+ {file = "llama_index_core-0.10.55.tar.gz", hash = "sha256:b02d46595c17805221a8f404c04a97609d1ce22e5be24ad7b7c4ac30e5181561"},][[package]]@@ -1677,7 +1661,7 @@ files = [[[package]]name = "llama-index-llms-openai"-version = "0.1.25"+version = "0.1.26"requires_python = "<4.0,>=3.8.1"summary = "llama-index llms openai integration"groups = ["default"]@@ -1685,8 +1669,8 @@ dependencies = ["llama-index-core<0.11.0,>=0.10.24",]files = [- {file = "llama_index_llms_openai-0.1.25-py3-none-any.whl", hash = "sha256:d1922ad2f2bb4697a6ee2f61793aeb2f5c5606302639559dd9bb0a1d6ab9e73f"},- {file = "llama_index_llms_openai-0.1.25.tar.gz", hash = "sha256:49750f71d58e762a597ce639a2ccb119195c47aefa8a48c55c77be8a5cec4bc5"},+ {file = "llama_index_llms_openai-0.1.26-py3-none-any.whl", hash = "sha256:1ad8e4eb02f9410c2091749d4d9aa9db4452646b595eb5eb937edbc496fb65fe"},+ {file = "llama_index_llms_openai-0.1.26.tar.gz", hash = "sha256:08a408cd53af4cd4623dd5807be4cbbd5e5b3ca01272128cd678d667343e4d5d"},][[package]]@@ -1736,7 +1720,7 @@ files = [[[package]]name = "llama-index-multi-modal-llms-openai"-version = "0.1.7"+version = "0.1.8"requires_python = "<4.0,>=3.8.1"summary = "llama-index multi-modal-llms openai integration"groups = ["default"]@@ -1745,7 +1729,8 @@ dependencies = ["llama-index-llms-openai<0.2.0,>=0.1.1",]files = [- {file = "llama_index_multi_modal_llms_openai-0.1.7-py3-none-any.whl", hash = "sha256:a86fa4a8f8372da31b978cc28d14da75ce6a39f42b1eea90cd3ac93017644766"},+ {file = "llama_index_multi_modal_llms_openai-0.1.8-py3-none-any.whl", hash = "sha256:16ae72ac3c5201ebd1d4b62203930c1768149ec85c3e477e5e51ed2ef8db1067"},+ {file = "llama_index_multi_modal_llms_openai-0.1.8.tar.gz", hash = "sha256:5e2c94a6415a2509cad035ccea34461959ae327a5900d3e820417e9ebb9a13ec"},][[package]]@@ -2009,7 +1994,7 @@ files = [[[package]]name = "msal"-version = "1.29.0"+version = "1.30.0"requires_python = ">=3.7"summary = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect."groups = ["default"]@@ -2019,8 +2004,8 @@ dependencies = ["requests<3,>=2.0.0",]files = [- {file = "msal-1.29.0-py3-none-any.whl", hash = "sha256:6b301e63f967481f0cc1a3a3bac0cf322b276855bc1b0955468d9deb3f33d511"},- {file = "msal-1.29.0.tar.gz", hash = "sha256:8f6725f099752553f9b2fe84125e2a5ebe47b49f92eacca33ebedd3a9ebaae25"},+ {file = "msal-1.30.0-py3-none-any.whl", hash = "sha256:423872177410cb61683566dc3932db7a76f661a5d2f6f52f02a047f101e1c1de"},+ {file = "msal-1.30.0.tar.gz", hash = "sha256:b4bf00850092e465157d814efa24a18f788284c9a479491024d62903085ea2fb"},][[package]]@@ -2388,7 +2373,7 @@ files = [[[package]]name = "portalocker"-version = "2.10.0"+version = "2.10.1"requires_python = ">=3.8"summary = "Wraps the portalocker recipe for easy usage"groups = ["default"]@@ -2396,8 +2381,8 @@ dependencies = ["pywin32>=226; platform_system == \"Windows\"",]files = [- {file = "portalocker-2.10.0-py3-none-any.whl", hash = "sha256:48944147b2cd42520549bc1bb8fe44e220296e56f7c3d551bc6ecce69d9b0de1"},- {file = "portalocker-2.10.0.tar.gz", hash = "sha256:49de8bc0a2f68ca98bf9e219c81a3e6b27097c7bf505a87c5a112ce1aaeb9b81"},+ {file = "portalocker-2.10.1-py3-none-any.whl", hash = "sha256:53a5984ebc86a025552264b459b46a2086e269b21823cb572f8f28ee759e45bf"},+ {file = "portalocker-2.10.1.tar.gz", hash = "sha256:ef1bf844e878ab08aee7e40184156e1151f228f103aa5c6bd0724cc330960f8f"},][[package]]@@ -2679,7 +2664,7 @@ files = [[[package]]name = "pypdf"-version = "4.2.0"+version = "4.3.0"requires_python = ">=3.6"summary = "A pure-python PDF library capable of splitting, merging, cropping, and transforming PDF files"groups = ["default"]@@ -2687,8 +2672,8 @@ dependencies = ["typing-extensions>=4.0; python_version < \"3.11\"",]files = [- {file = "pypdf-4.2.0-py3-none-any.whl", hash = "sha256:dc035581664e0ad717e3492acebc1a5fc23dba759e788e3d4a9fc9b1a32e72c1"},- {file = "pypdf-4.2.0.tar.gz", hash = "sha256:fe63f3f7d1dcda1c9374421a94c1bba6c6f8c4a62173a59b64ffd52058f846b1"},+ {file = "pypdf-4.3.0-py3-none-any.whl", hash = "sha256:eeea4d019b57c099d02a0e1692eaaab23341ae3f255c1dafa3c8566b4636496d"},+ {file = "pypdf-4.3.0.tar.gz", hash = "sha256:0d7a4c67fd03782f5a09d3f48c11c7a31e0bb9af78861a25229bb49259ed0504"},][[package]]@@ -3095,18 +3080,18 @@ files = [[[package]]name = "setuptools"-version = "70.3.0"+version = "71.0.3"requires_python = ">=3.8"summary = "Easily download, build, install, upgrade, and uninstall Python packages"groups = ["default"]files = [- {file = "setuptools-70.3.0-py3-none-any.whl", hash = "sha256:fe384da74336c398e0d956d1cae0669bc02eed936cdb1d49b57de1990dc11ffc"},- {file = "setuptools-70.3.0.tar.gz", hash = "sha256:f171bab1dfbc86b132997f26a119f6056a57950d058587841a0082e8830f9dc5"},+ {file = "setuptools-71.0.3-py3-none-any.whl", hash = "sha256:f501b6e6db709818dc76882582d9c516bf3b67b948864c5fa1d1624c09a49207"},+ {file = "setuptools-71.0.3.tar.gz", hash = "sha256:3d8531791a27056f4a38cd3e54084d8b1c4228ff9cf3f2d7dd075ec99f9fd70d"},][[package]]name = "shapely"-version = "2.0.4"+version = "2.0.5"requires_python = ">=3.7"summary = "Manipulation and analysis of geometric objects"groups = ["default"]@@ -3114,28 +3099,25 @@ dependencies = ["numpy<3,>=1.14",]files = [- {file = "shapely-2.0.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:011b77153906030b795791f2fdfa2d68f1a8d7e40bce78b029782ade3afe4f2f"},- {file = "shapely-2.0.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9831816a5d34d5170aa9ed32a64982c3d6f4332e7ecfe62dc97767e163cb0b17"},- {file = "shapely-2.0.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5c4849916f71dc44e19ed370421518c0d86cf73b26e8656192fcfcda08218fbd"},- {file = "shapely-2.0.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:841f93a0e31e4c64d62ea570d81c35de0f6cea224568b2430d832967536308e6"},- {file = "shapely-2.0.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b4431f522b277c79c34b65da128029a9955e4481462cbf7ebec23aab61fc58"},- {file = "shapely-2.0.4-cp310-cp310-win32.whl", hash = "sha256:92a41d936f7d6743f343be265ace93b7c57f5b231e21b9605716f5a47c2879e7"},- {file = "shapely-2.0.4-cp310-cp310-win_amd64.whl", hash = "sha256:30982f79f21bb0ff7d7d4a4e531e3fcaa39b778584c2ce81a147f95be1cd58c9"},- {file = "shapely-2.0.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:de0205cb21ad5ddaef607cda9a3191eadd1e7a62a756ea3a356369675230ac35"},- {file = "shapely-2.0.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:7d56ce3e2a6a556b59a288771cf9d091470116867e578bebced8bfc4147fbfd7"},- {file = "shapely-2.0.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:58b0ecc505bbe49a99551eea3f2e8a9b3b24b3edd2a4de1ac0dc17bc75c9ec07"},- {file = "shapely-2.0.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:790a168a808bd00ee42786b8ba883307c0e3684ebb292e0e20009588c426da47"},- {file = "shapely-2.0.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4310b5494271e18580d61022c0857eb85d30510d88606fa3b8314790df7f367d"},- {file = "shapely-2.0.4-cp311-cp311-win32.whl", hash = "sha256:63f3a80daf4f867bd80f5c97fbe03314348ac1b3b70fb1c0ad255a69e3749879"},- {file = "shapely-2.0.4-cp311-cp311-win_amd64.whl", hash = "sha256:c52ed79f683f721b69a10fb9e3d940a468203f5054927215586c5d49a072de8d"},- {file = "shapely-2.0.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:3f9103abd1678cb1b5f7e8e1af565a652e036844166c91ec031eeb25c5ca8af0"},- {file = "shapely-2.0.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:263bcf0c24d7a57c80991e64ab57cba7a3906e31d2e21b455f493d4aab534aaa"},- {file = "shapely-2.0.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ddf4a9bfaac643e62702ed662afc36f6abed2a88a21270e891038f9a19bc08fc"},- {file = "shapely-2.0.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:485246fcdb93336105c29a5cfbff8a226949db37b7473c89caa26c9bae52a242"},- {file = "shapely-2.0.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8de4578e838a9409b5b134a18ee820730e507b2d21700c14b71a2b0757396acc"},- {file = "shapely-2.0.4-cp39-cp39-win32.whl", hash = "sha256:9dab4c98acfb5fb85f5a20548b5c0abe9b163ad3525ee28822ffecb5c40e724c"},- {file = "shapely-2.0.4-cp39-cp39-win_amd64.whl", hash = "sha256:31c19a668b5a1eadab82ff070b5a260478ac6ddad3a5b62295095174a8d26398"},- {file = "shapely-2.0.4.tar.gz", hash = "sha256:5dc736127fac70009b8d309a0eeb74f3e08979e530cf7017f2f507ef62e6cfb8"},+ {file = "shapely-2.0.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:89d34787c44f77a7d37d55ae821f3a784fa33592b9d217a45053a93ade899375"},+ {file = "shapely-2.0.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:798090b426142df2c5258779c1d8d5734ec6942f778dab6c6c30cfe7f3bf64ff"},+ {file = "shapely-2.0.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:45211276900c4790d6bfc6105cbf1030742da67594ea4161a9ce6812a6721e68"},+ {file = "shapely-2.0.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e119444bc27ca33e786772b81760f2028d930ac55dafe9bc50ef538b794a8e1"},+ {file = "shapely-2.0.5-cp310-cp310-win32.whl", hash = "sha256:9a4492a2b2ccbeaebf181e7310d2dfff4fdd505aef59d6cb0f217607cb042fb3"},+ {file = "shapely-2.0.5-cp310-cp310-win_amd64.whl", hash = "sha256:1e5cb5ee72f1bc7ace737c9ecd30dc174a5295fae412972d3879bac2e82c8fae"},+ {file = "shapely-2.0.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5bbfb048a74cf273db9091ff3155d373020852805a37dfc846ab71dde4be93ec"},+ {file = "shapely-2.0.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:93be600cbe2fbaa86c8eb70656369f2f7104cd231f0d6585c7d0aa555d6878b8"},+ {file = "shapely-2.0.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f8e71bb9a46814019f6644c4e2560a09d44b80100e46e371578f35eaaa9da1c"},+ {file = "shapely-2.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5251c28a29012e92de01d2e84f11637eb1d48184ee8f22e2df6c8c578d26760"},+ {file = "shapely-2.0.5-cp311-cp311-win32.whl", hash = "sha256:35110e80070d664781ec7955c7de557456b25727a0257b354830abb759bf8311"},+ {file = "shapely-2.0.5-cp311-cp311-win_amd64.whl", hash = "sha256:6c6b78c0007a34ce7144f98b7418800e0a6a5d9a762f2244b00ea560525290c9"},+ {file = "shapely-2.0.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7545a39c55cad1562be302d74c74586f79e07b592df8ada56b79a209731c0219"},+ {file = "shapely-2.0.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4c83a36f12ec8dee2066946d98d4d841ab6512a6ed7eb742e026a64854019b5f"},+ {file = "shapely-2.0.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:89e640c2cd37378480caf2eeda9a51be64201f01f786d127e78eaeff091ec897"},+ {file = "shapely-2.0.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:06efe39beafde3a18a21dde169d32f315c57da962826a6d7d22630025200c5e6"},+ {file = "shapely-2.0.5-cp39-cp39-win32.whl", hash = "sha256:8203a8b2d44dcb366becbc8c3d553670320e4acf0616c39e218c9561dd738d92"},+ {file = "shapely-2.0.5-cp39-cp39-win_amd64.whl", hash = "sha256:7fed9dbfbcfec2682d9a047b9699db8dcc890dfca857ecba872c42185fc9e64e"},+ {file = "shapely-2.0.5.tar.gz", hash = "sha256:bff2366bc786bfa6cb353d6b47d0443c570c32776612e527ee47b6df63fcfe32"},][[package]]@@ -3523,7 +3505,7 @@ files = [[[package]]name = "unstract-adapters"-version = "0.21.0"+version = "0.22.0"requires_python = "<3.12,>=3.9"summary = "Unstract interface for LLMs, Embeddings and VectorDBs"groups = ["default"]@@ -3552,8 +3534,8 @@ dependencies = ["singleton-decorator~=1.0.0",]files = [- {file = "unstract_adapters-0.21.0-py3-none-any.whl", hash = "sha256:6c4f597602f55b80ba176a29a930755abd3494ff1c085f406536e7463902d655"},- {file = "unstract_adapters-0.21.0.tar.gz", hash = "sha256:ebb8f80b7f26f04874bb5466fe0be8c3e1b51d44ed85c4e62289a7751c996af6"},+ {file = "unstract_adapters-0.22.0-py3-none-any.whl", hash = "sha256:0c0c4fe262ee1e3c98858ac4911c9c5accad52f92d7408e5eddef958168f786f"},+ {file = "unstract_adapters-0.22.0.tar.gz", hash = "sha256:f8ca322a1ec50e0fe257b1bb4ad6da4f6f5ca3016114437fe9119fe374e3a44b"},][[package]]@@ -3587,7 +3569,7 @@ dependencies = [[[package]]name = "unstract-sdk"-version = "0.37.0"+version = "0.38.0"requires_python = "<3.11.1,>=3.9"summary = "A framework for writing Unstract Tools/Apps"groups = ["default"]@@ -3599,11 +3581,11 @@ dependencies = ["python-magic~=0.4.27","tiktoken~=0.4.0","transformers==4.37.0",- "unstract-adapters~=0.21.0",+ "unstract-adapters~=0.22.0",]files = [- {file = "unstract_sdk-0.37.0-py3-none-any.whl", hash = "sha256:3bd83dfb7a760e73f35cc9ed4bdadf645bd77f03f77d25578e842156645e6f1d"},- {file = "unstract_sdk-0.37.0.tar.gz", hash = "sha256:a00b81f014508db0130dd21d594e3d8e0034dcafd3f01461ce30d37e68646944"},+ {file = "unstract_sdk-0.38.0-py3-none-any.whl", hash = "sha256:846343de9a55ca5a3b83a75fa85d7792f4bb4131703fb88127c6782684fa7fec"},+ {file = "unstract_sdk-0.38.0.tar.gz", hash = "sha256:8b39f5cc06d179abcc4267762e65180cf18b3b7af2ecd9c7266ac3f030995ae0"},][[package]]@@ -3619,13 +3601,13 @@ files = [[[package]]name = "validators"-version = "0.32.0"+version = "0.33.0"requires_python = ">=3.8"summary = "Python Data Validation for Humans™"groups = ["default"]files = [- {file = "validators-0.32.0-py3-none-any.whl", hash = "sha256:e9ce1703afb0adf7724b0f98e4081d9d10e88fa5d37254d21e41f27774c020cd"},- {file = "validators-0.32.0.tar.gz", hash = "sha256:9ee6e6d7ac9292b9b755a3155d7c361d76bb2dce23def4f0627662da1e300676"},+ {file = "validators-0.33.0-py3-none-any.whl", hash = "sha256:134b586a98894f8139865953899fc2daeb3d0c35569552c5518f089ae43ed075"},+ {file = "validators-0.33.0.tar.gz", hash = "sha256:535867e9617f0100e676a1257ba1e206b9bfd847ddc171e4d44811f07ff0bfbf"},][[package]]diff --git a/prompt-service/pyproject.toml b/prompt-service/pyproject.tomlindex 5b756eaf4..53ef2b1ef 100644--- a/prompt-service/pyproject.toml+++ b/prompt-service/pyproject.toml@@ -15,7 +15,7 @@ dependencies = ["flask~=3.0","llama-index==0.10.38","python-dotenv==1.0.0",- "unstract-sdk~=0.37.0",+ "unstract-sdk~=0.38.0","redis>=5.0.3","unstract-core @ file:///${PROJECT_ROOT}/../unstract/core","unstract-flags @ file:///${PROJECT_ROOT}/../unstract/flags",diff --git a/pyproject.toml b/pyproject.tomlindex 90c6c5f49..221919c29 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -40,8 +40,8 @@ hook-check-django-migrations = ["psycopg2-binary==2.9.9","python-dotenv==1.0.0","python-magic==0.4.27",- "unstract-sdk~=0.37.0",- "unstract-adapters~=0.21.0",+ "unstract-sdk~=0.38.0",+ "unstract-adapters~=0.22.0","-e unstract-connectors @ file:///${PROJECT_ROOT}/unstract/connectors","-e unstract-core @ file:///${PROJECT_ROOT}/unstract/core","-e unstract-flags @ file:///${PROJECT_ROOT}/unstract/flags",diff --git a/tools/classifier/requirements.txt b/tools/classifier/requirements.txtindex 8464854a0..2a30fa417 100644--- a/tools/classifier/requirements.txt+++ b/tools/classifier/requirements.txt@@ -1,4 +1,4 @@# Add your dependencies here# Required for all unstract tools-unstract-sdk~=0.37.0+unstract-sdk~=0.38.0diff --git a/tools/structure/requirements.txt b/tools/structure/requirements.txtindex 8464854a0..2a30fa417 100644--- a/tools/structure/requirements.txt+++ b/tools/structure/requirements.txt@@ -1,4 +1,4 @@# Add your dependencies here# Required for all unstract tools-unstract-sdk~=0.37.0+unstract-sdk~=0.38.0diff --git a/tools/structure/src/config/properties.json b/tools/structure/src/config/properties.jsonindex 9ba6bc66b..386d897d0 100644--- a/tools/structure/src/config/properties.json+++ b/tools/structure/src/config/properties.json@@ -2,7 +2,7 @@"schemaVersion": "0.0.1","displayName": "Structure Tool","functionName": "structure_tool",- "toolVersion": "0.0.30",+ "toolVersion": "0.0.31","description": "This is a template tool which can answer set of input prompts designed in the Prompt Studio","input": {"description": "File that needs to be indexed and parsed for answers"diff --git a/tools/text_extractor/requirements.txt b/tools/text_extractor/requirements.txtindex 8464854a0..2a30fa417 100644--- a/tools/text_extractor/requirements.txt+++ b/tools/text_extractor/requirements.txt@@ -1,4 +1,4 @@# Add your dependencies here# Required for all unstract tools-unstract-sdk~=0.37.0+unstract-sdk~=0.38.0diff --git a/tools/text_extractor/src/config/properties.json b/tools/text_extractor/src/config/properties.jsonindex 98c529a19..5a85d1462 100644--- a/tools/text_extractor/src/config/properties.json+++ b/tools/text_extractor/src/config/properties.json@@ -2,7 +2,7 @@"schemaVersion": "0.0.1","displayName": "Text Extractor","functionName": "text_extractor",- "toolVersion": "0.0.24",+ "toolVersion": "0.0.25","description": "The Text Extractor is a powerful tool designed to convert documents to its text form or Extract texts from documents","input": {"description": "Document"diff --git a/unstract/tool-registry/pyproject.toml b/unstract/tool-registry/pyproject.tomlindex a33c892e4..b4bb20f48 100644--- a/unstract/tool-registry/pyproject.toml+++ b/unstract/tool-registry/pyproject.toml@@ -13,7 +13,7 @@ dependencies = ["docker~=6.1.3","jsonschema~=4.18.2","PyYAML~=6.0.1",- "unstract-adapters~=0.21.0",+ "unstract-adapters~=0.22.0",# ! IMPORTANT!# Local dependencies usually need to be added as:# https://pdm-project.org/latest/usage/dependency/#local-dependenciesdiff --git a/unstract/tool-registry/src/unstract/tool_registry/public_tools.json b/unstract/tool-registry/src/unstract/tool_registry/public_tools.jsonindex f000fd307..c74e8e471 100644--- a/unstract/tool-registry/src/unstract/tool_registry/public_tools.json+++ b/unstract/tool-registry/src/unstract/tool_registry/public_tools.json@@ -5,7 +5,7 @@"schemaVersion": "0.0.1","displayName": "File Classifier","functionName": "classify",- "toolVersion": "0.0.25",+ "toolVersion": "0.0.26","description": "Classifies a file into a bin based on its contents","input": {"description": "File to be classified"@@ -139,9 +139,9 @@}},"icon": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n enable-background=\"new 0 0 20 20\"\n height=\"48\"\n viewBox=\"0 0 20 20\"\n width=\"48\"\n fill=\"#000000\"\n version=\"1.1\"\n id=\"svg8109\"\n sodipodi:docname=\"folder_copy_black_48dp.svg\"\n xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\"\n xmlns:sodipodi=\"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\"\n xmlns=\"http://www.w3.org/2000/svg\"\n xmlns:svg=\"http://www.w3.org/2000/svg\">\n <defs\n id=\"defs8113\" />\n <sodipodi:namedview\n id=\"namedview8111\"\n pagecolor=\"#ffffff\"\n bordercolor=\"#000000\"\n borderopacity=\"0.25\"\n inkscape:showpageshadow=\"2\"\n inkscape:pageopacity=\"0.0\"\n inkscape:pagecheckerboard=\"0\"\n inkscape:deskcolor=\"#d1d1d1\"\n showgrid=\"false\" />\n <g\n id=\"g8099\">\n <rect\n fill=\"none\"\n height=\"20\"\n width=\"20\"\n x=\"0\"\n id=\"rect8097\"\n y=\"0\" />\n </g>\n <g\n id=\"g8107\"\n style=\"fill:#ff4d6d;fill-opacity:1\">\n <g\n id=\"g8105\"\n style=\"fill:#ff4d6d;fill-opacity:1\">\n <path\n d=\"M 2.5,5 H 1 V 15.5 C 1,16.33 1.67,17 2.5,17 H 15.68 V 15.5 H 2.5 Z\"\n id=\"path8101\"\n style=\"fill:#ff4d6d;fill-opacity:1\" />\n <path\n d=\"M 16.5,4 H 11 L 9,2 H 5.5 C 4.67,2 4,2.67 4,3.5 v 9 C 4,13.33 4.67,14 5.5,14 h 11 c 0.83,0 1.5,-0.67 1.5,-1.5 v -7 C 18,4.67 17.33,4 16.5,4 Z m 0,8.5 h -11 v -9 h 2.88 l 2,2 h 6.12 z\"\n id=\"path8103\"\n style=\"fill:#ff4d6d;fill-opacity:1\" />\n </g>\n </g>\n</svg>\n",- "image_url": "docker:unstract/tool-classifier:0.0.25",+ "image_url": "docker:unstract/tool-classifier:0.0.26","image_name": "unstract/tool-classifier",- "image_tag": "0.0.25"+ "image_tag": "0.0.26"},"text_extractor": {"tool_uid": "text_extractor",@@ -149,7 +149,7 @@"schemaVersion": "0.0.1","displayName": "Text Extractor","functionName": "text_extractor",- "toolVersion": "0.0.24",+ "toolVersion": "0.0.25","description": "The Text Extractor is a powerful tool designed to convert documents to its text form or Extract texts from documents","input": {"description": "Document"@@ -224,8 +224,8 @@}},"icon": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n enable-background=\"new 0 0 20 20\"\n height=\"48\"\n viewBox=\"0 0 20 20\"\n width=\"48\"\n fill=\"#000000\"\n version=\"1.1\"\n id=\"svg8109\"\n sodipodi:docname=\"folder_copy_black_48dp.svg\"\n xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\"\n xmlns:sodipodi=\"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\"\n xmlns=\"http://www.w3.org/2000/svg\"\n xmlns:svg=\"http://www.w3.org/2000/svg\">\n <defs\n id=\"defs8113\" />\n <sodipodi:namedview\n id=\"namedview8111\"\n pagecolor=\"#ffffff\"\n bordercolor=\"#000000\"\n borderopacity=\"0.25\"\n inkscape:showpageshadow=\"2\"\n inkscape:pageopacity=\"0.0\"\n inkscape:pagecheckerboard=\"0\"\n inkscape:deskcolor=\"#d1d1d1\"\n showgrid=\"false\" />\n <g\n id=\"g8099\">\n <rect\n fill=\"none\"\n height=\"20\"\n width=\"20\"\n x=\"0\"\n id=\"rect8097\"\n y=\"0\" />\n </g>\n <g\n id=\"g8107\"\n style=\"fill:#ff4d6d;fill-opacity:1\">\n <g\n id=\"g8105\"\n style=\"fill:#ff4d6d;fill-opacity:1\">\n <path\n d=\"M 2.5,5 H 1 V 15.5 C 1,16.33 1.67,17 2.5,17 H 15.68 V 15.5 H 2.5 Z\"\n id=\"path8101\"\n style=\"fill:#ff4d6d;fill-opacity:1\" />\n <path\n d=\"M 16.5,4 H 11 L 9,2 H 5.5 C 4.67,2 4,2.67 4,3.5 v 9 C 4,13.33 4.67,14 5.5,14 h 11 c 0.83,0 1.5,-0.67 1.5,-1.5 v -7 C 18,4.67 17.33,4 16.5,4 Z m 0,8.5 h -11 v -9 h 2.88 l 2,2 h 6.12 z\"\n id=\"path8103\"\n style=\"fill:#ff4d6d;fill-opacity:1\" />\n </g>\n </g>\n</svg>\n",- "image_url": "docker:unstract/tool-text-extractor:0.0.24",+ "image_url": "docker:unstract/tool-text-extractor:0.0.25","image_name": "unstract/tool-text-extractor",- "image_tag": "0.0.24"+ "image_tag": "0.0.25"}}