Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MERGE-WITH-SDK-ROLL-RC6] Remote Storage: Tool build and version roll over #888

Merged
merged 11 commits into from
Dec 12, 2024
Merged

[MERGE-WITH-SDK-ROLL-RC6] Remote Storage: Tool build and version roll over #888

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
efe74c8
Roll to latest SDK
gaya3-zipstack Dec 4, 2024
3ba42c2
Commit pdm.lock changes
gaya3-zipstack Dec 4, 2024
0796874
Merge main
gaya3-zipstack Dec 6, 2024
12cd28e
Remove pandoc and tessaract
gaya3-zipstack Dec 10, 2024
bc4deae
Revert change
gaya3-zipstack Dec 11, 2024
3def519
Merge remote-tracking branch 'origin' into feature/remote_storage
gaya3-zipstack Dec 11, 2024
26b2fcb
Roll tool versions
gaya3-zipstack Dec 11, 2024
ea0fc25
Roll tool versions
gaya3-zipstack Dec 11, 2024
bc9f145
Roll version
gaya3-zipstack Dec 11, 2024
587322f
Commit pdm.lock changes
gaya3-zipstack Dec 11, 2024
bcb76ae
Merge branch 'main' into feature/remote_storage
gaya3-zipstack Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/sample.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ REMOTE_PROMPT_STUDIO_FILE_PATH=

# 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.49"
STRUCTURE_TOOL_IMAGE_URL="docker:unstract/tool-structure:0.0.51"
STRUCTURE_TOOL_IMAGE_NAME="unstract/tool-structure"
STRUCTURE_TOOL_IMAGE_TAG="0.0.49"
STRUCTURE_TOOL_IMAGE_TAG="0.0.51"

# Feature Flags
EVALUATION_SERVER_IP=unstract-flipt
Expand Down
2 changes: 1 addition & 1 deletion platform-service/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies = [
"redis~=5.0.1",
"cryptography>=41.0.7",
"requests>=2.31.0",
"unstract-sdk==0.54.0rc5",
"unstract-sdk~=0.54.0rc6",
"gcsfs==2024.10.0",
"unstract-flags @ file:///${PROJECT_ROOT}/../unstract/flags",
]
Expand Down
4 changes: 2 additions & 2 deletions tools/classifier/requirements.txt
View file
Open in desktop
gaya3-zipstack marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Add your dependencies here

# Required for all unstract tools
unstract-sdk~=0.54.0rc5
# TODO: remove once it added in sdk
unstract-sdk~=0.54.0rc6
# Required for remote storage support
s3fs[boto3]==2024.6.0
4 changes: 2 additions & 2 deletions tools/structure/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Add your dependencies here

# Required for all unstract tools
unstract-sdk~=0.54.0rc5
# TODO: remove once it added in sdk
unstract-sdk~=0.54.0rc6
# Required for remote storage support
s3fs[boto3]==2024.6.0
2 changes: 1 addition & 1 deletion tools/structure/src/config/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"schemaVersion": "0.0.1",
"displayName": "Structure Tool",
"functionName": "structure_tool",
"toolVersion": "0.0.50",
"toolVersion": "0.0.51",
"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"
Expand Down
4 changes: 2 additions & 2 deletions tools/text_extractor/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Add your dependencies here

# Required for all unstract tools
unstract-sdk~=0.54.0rc5
# TODO: remove once it added in sdk
unstract-sdk~=0.54.0rc6
# Required for remote storage support
s3fs[boto3]==2024.6.0
2 changes: 1 addition & 1 deletion tools/text_extractor/src/config/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"schemaVersion": "0.0.1",
"displayName": "Text Extractor",
"functionName": "text_extractor",
"toolVersion": "0.0.38",
"toolVersion": "0.0.39",
"description": "The Text Extractor is a powerful tool designed to convert documents to its text form or Extract texts from documents",
"input": {
"description": "Document"
Expand Down
12 changes: 6 additions & 6 deletions unstract/tool-registry/tool_registry_config/public_tools_remote_storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"schemaVersion": "0.0.1",
"displayName": "File Classifier Remote Storage",
"functionName": "classify",
"toolVersion": "0.0.39",
"toolVersion": "0.0.40",
"description": "Classifies a file into a bin based on its contents",
"input": {
"description": "File to be classified"
Expand Down Expand Up @@ -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.39",
"image_url": "docker:unstract/tool-classifier:0.0.40",
"image_name": "unstract/tool-classifier",
"image_tag": "0.0.39"
"image_tag": "0.0.40"
},
"text_extractor": {
"tool_uid": "text_extractor",
"properties": {
"schemaVersion": "0.0.1",
"displayName": "Text Extractor Remote Storage",
"functionName": "text_extractor",
"toolVersion": "0.0.37",
"toolVersion": "0.0.39",
"description": "The Text Extractor is a powerful tool designed to convert documents to its text form or Extract texts from documents",
"input": {
"description": "Document"
Expand Down Expand Up @@ -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.37",
"image_url": "docker:unstract/tool-text-extractor:0.0.39",
"image_name": "unstract/tool-text-extractor",
"image_tag": "0.0.37"
"image_tag": "0.0.39"
}
}
Loading