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] [FEAT] Rolling out RC6 to OSS #889

Merged
merged 7 commits into from
Dec 12, 2024
Merged

[MERGE-WITH-SDK-ROLL-RC6] [FEAT] Rolling out RC6 to OSS #889

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2a45f49
Rolling out RC6 to OSS
harini-venkataraman Dec 11, 2024
0c2fa2d
Commit pdm.lock changes
harini-venkataraman Dec 11, 2024
3ca511b
Raising DRF exception for FileNotFoundError
harini-venkataraman Dec 12, 2024
fad8d20
Commit pdm.lock changes
harini-venkataraman Dec 12, 2024
aff96aa
Merge branch 'main' into feat/rc6-rollout
harini-venkataraman Dec 12, 2024
edc199a
Merge branch 'main' into feat/rc6-rollout
gaya3-zipstack Dec 12, 2024
d4a3a20
Commit pdm.lock changes
gaya3-zipstack Dec 12, 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
169 changes: 107 additions & 62 deletions backend/pdm.lock
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 15 additions & 7 deletions backend/prompt_studio/prompt_studio_core_v2/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,13 +437,21 @@ def fetch_contents_ide(self, request: HttpRequest, pk: Any = None) -> Response:
file_path += file_name
contents = FileManagerHelper.fetch_file_contents(file_system, file_path)
else:
contents = PromptStudioFileHelper.fetch_file_contents(
file_name=file_name,
org_id=UserSessionUtils.get_organization_id(request),
user_id=custom_tool.created_by.user_id,
tool_id=str(custom_tool.tool_id),
)

try:
contents = PromptStudioFileHelper.fetch_file_contents(
file_name=file_name,
org_id=UserSessionUtils.get_organization_id(request),
user_id=custom_tool.created_by.user_id,
tool_id=str(custom_tool.tool_id),
)
except FileNotFoundError:
harini-venkataraman marked this conversation as resolved.
Show resolved Hide resolved
return Response(
{
"data": f"File {file_name} not found. Looks like it "
"must be deleted or moved to a different location."
},
status=status.HTTP_404_NOT_FOUND,
)
harini-venkataraman marked this conversation as resolved.
Show resolved Hide resolved
return Response({"data": contents}, status=status.HTTP_200_OK)

@action(detail=True, methods=["post"])
Expand Down
2 changes: 1 addition & 1 deletion backend/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.54.0rc5",
"unstract-sdk~=0.54.0rc6",
# ! IMPORTANT!
# Indirect local dependencies usually need to be added in their own projects
# as: https://pdm-project.org/latest/usage/dependency/#local-dependencies.
Expand Down
271 changes: 158 additions & 113 deletions pdm.lock
View file
Open in desktop

Large diffs are not rendered by default.

382 changes: 191 additions & 191 deletions platform-service/pdm.lock
View file
Open in desktop

Large diffs are not rendered by default.

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
218 changes: 109 additions & 109 deletions prompt-service/pdm.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion prompt-service/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies = [
"flask~=3.0",
"llama-index==0.10.58",
"python-dotenv==1.0.0",
"unstract-sdk~=0.54.0rc5",
"unstract-sdk~=0.54.0rc6",
"redis>=5.0.3",
"unstract-core @ file:///${PROJECT_ROOT}/../unstract/core",
"unstract-flags @ file:///${PROJECT_ROOT}/../unstract/flags",
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.54.0rc5",
"unstract-sdk~=0.54.0rc6",
"-e unstract-connectors @ file:///${PROJECT_ROOT}/unstract/connectors",
"-e unstract-core @ file:///${PROJECT_ROOT}/unstract/core",
"-e unstract-flags @ file:///${PROJECT_ROOT}/unstract/flags",
Expand Down
2 changes: 1 addition & 1 deletion unstract/tool-registry/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies = [
"docker~=6.1.3",
"jsonschema~=4.18.2",
"PyYAML~=6.0.1",
"unstract-sdk~=0.54.0rc5",
"unstract-sdk~=0.54.0rc6",
# ! IMPORTANT!
# Local dependencies usually need to be added as:
# https://pdm-project.org/latest/usage/dependency/#local-dependencies
Expand Down