Support bedrock as a LLM adapter (#565)

* SDK version upgrade * Upgrade tool versions * Update tool version * Check in lock files * Merge from main * SDK roll to 0.42.0 related changes * SDK version and tool version upgrade * Update pdm.lock for unstract/core * Update pdm.lock for prompt-service * Update pdm.lock for backend * Update pdm.lock for root * Update pdm.lock for unstract/core * Update pdm.lock for prompt-service * Update pdm.lock for backend * Update pdm.lock for root --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Zipstack · Aug 12, 2024 · 21b5d92 · 21b5d92
1 parent 4279cde
commit 21b5d92
Show file tree

Hide file tree

Showing 19 changed files with 1,465 additions and 1,382 deletions.
diff --git a/backend/pdm.lock b/backend/pdm.lock
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
@@ -11,7 +11,7 @@ authors = [
 ]
 dependencies = [
     "Authlib==1.2.1", # For Auth plugins
-    "boto3~=1.28.17", # For Unstract-cloud-storage
+    "boto3~=1.34.0", # For Unstract-cloud-storage
     "celery>=5.3.4", # For Celery
     "flower>=2.0.1", # Celery Monitoring
     "cron-descriptor==1.4.0", # For cron string description
@@ -32,7 +32,7 @@ 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.41.1",
+    "unstract-sdk~=0.42.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.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.35"
+STRUCTURE_TOOL_IMAGE_URL="docker:unstract/tool-structure:0.0.36"
 STRUCTURE_TOOL_IMAGE_NAME="unstract/tool-structure"
-STRUCTURE_TOOL_IMAGE_TAG="0.0.35"
+STRUCTURE_TOOL_IMAGE_TAG="0.0.36"
 
 # Feature Flags
 EVALUATION_SERVER_IP=unstract-flipt

diff --git a/frontend/public/icons/adapter-icons/Bedrock.png b/frontend/public/icons/adapter-icons/Bedrock.png
diff --git a/pdm.lock b/pdm.lock
diff --git a/prompt-service/pdm.lock b/prompt-service/pdm.lock
diff --git a/prompt-service/pyproject.toml b/prompt-service/pyproject.toml
@@ -15,7 +15,7 @@ dependencies = [
     "flask~=3.0",
     "llama-index==0.10.58",
     "python-dotenv==1.0.0",
-    "unstract-sdk~=0.41.1",
+    "unstract-sdk~=0.42.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.toml
@@ -41,7 +41,7 @@ hook-check-django-migrations = [
     "psycopg2-binary==2.9.9",
     "python-dotenv==1.0.0",
     "python-magic==0.4.27",
-    "unstract-sdk~=0.41.1",
+    "unstract-sdk~=0.42.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.txt
@@ -1,4 +1,4 @@
 # Add your dependencies here
 
 # Required for all unstract tools
-unstract-sdk~=0.41.1
+unstract-sdk~=0.42.0
diff --git a/tools/classifier/src/config/properties.json b/tools/classifier/src/config/properties.json
@@ -2,7 +2,7 @@
   "schemaVersion": "0.0.1",
   "displayName": "File Classifier",
   "functionName": "classify",
-  "toolVersion": "0.0.30",
+  "toolVersion": "0.0.31",
   "description": "Classifies a file into a bin based on its contents",
   "input": {
     "description": "File to be classified"

diff --git 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.41.1
+unstract-sdk~=0.42.0
diff --git 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.35",
+  "toolVersion": "0.0.36",
   "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.txt
@@ -1,4 +1,4 @@
 # Add your dependencies here
 
 # Required for all unstract tools
-unstract-sdk~=0.41.1
+unstract-sdk~=0.42.0
diff --git 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.28",
+  "toolVersion": "0.0.29",
   "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/connectors/pyproject.toml b/unstract/connectors/pyproject.toml
@@ -13,12 +13,12 @@ dependencies = [
     "google-cloud-secret-manager==2.16.1",
     "google-cloud-storage==2.9.0",
     # Filesystem connectors
-    "s3fs[boto3]==2023.6.0", # For Minio
+    "s3fs[boto3]==2024.6.0", # For Minio
     "PyDrive2[fsspec]==1.15.4", # For GDrive
     "oauth2client==4.1.3", # For GDrive
     "dropboxdrivefs==1.4.1", # For Dropbox
     "boxfs==0.2.1", # For Box
-    "gcsfs==2023.6.0", # For GoogleCloudStorage
+    "gcsfs==2024.6.0", # For GoogleCloudStorage
     "adlfs==2023.8.0", # For AzureCloudStorage
     # Database connectors
     "psycopg2-binary==2.9.9", # For Postgres, Redshift

diff --git a/unstract/core/pdm.lock b/unstract/core/pdm.lock
diff --git a/unstract/core/pyproject.toml b/unstract/core/pyproject.toml
@@ -10,8 +10,8 @@ authors = [
     {name = "Zipstack Inc.", email = "[email protected]"}
 ]
 dependencies = [
-    "boto3~=1.28.17",
-    "botocore~=1.31.17",
+    "boto3~=1.34.0",
+    "botocore~=1.34.0",
     "llama-index==0.10.58",
     "llama-index-llms-azure-openai==0.1.10",
     "redis~=5.0.1",

diff --git 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-sdk~=0.41.1",
+    "unstract-sdk~=0.42.0",
     # ! IMPORTANT!
     # Local dependencies usually need to be added as:
     # https://pdm-project.org/latest/usage/dependency/#local-dependencies

diff --git a/unstract/tool-registry/tool_registry_config/public_tools.json b/unstract/tool-registry/tool_registry_config/public_tools.json
@@ -5,7 +5,7 @@
             "schemaVersion": "0.0.1",
             "displayName": "File Classifier",
             "functionName": "classify",
-            "toolVersion": "0.0.30",
+            "toolVersion": "0.0.31",
             "description": "Classifies a file into a bin based on its contents",
             "input": {
                 "description": "File to be classified"
@@ -106,17 +106,17 @@
             "properties": {}
         },
         "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.30",
+        "image_url": "docker:unstract/tool-classifier:0.0.31",
         "image_name": "unstract/tool-classifier",
-        "image_tag": "0.0.30"
+        "image_tag": "0.0.31"
     },
     "text_extractor": {
         "tool_uid": "text_extractor",
         "properties": {
             "schemaVersion": "0.0.1",
             "displayName": "Text Extractor",
             "functionName": "text_extractor",
-            "toolVersion": "0.0.28",
+            "toolVersion": "0.0.29",
             "description": "The Text Extractor is a powerful tool designed to convert documents to its text form or Extract texts from documents",
             "input": {
                 "description": "Document"
@@ -191,8 +191,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.28",
+        "image_url": "docker:unstract/tool-text-extractor:0.0.29",
         "image_name": "unstract/tool-text-extractor",
-        "image_tag": "0.0.28"
+        "image_tag": "0.0.29"
     }
 }