UN-3445 [MISC] backmerge main into feat — prompt-service collapse + UN-3735 .value fix

[muhammad-ali-e]

What

Backmerge main (23 commits) into the PG-queue integration branch feat/UN-3445-pg-queue-integration, keeping it current before the epic feat→main PR.

Notable incoming changes:

• prompt-service → backend collapse (renames + prompt.Dockerfile removal)
• UN-3735 destination-DB status .value fix (database_utils.py)
• New backend test suites (api_v2, connector_v2, workflow_v2, usage_v2, …)
• CI workflow updates

Conflicts (2 — both resolved deterministically)

File	Resolution	Why
workers/tests/test_legacy_executor_scaffold.py	Accept main's deletion of test_no_flask_import	Main (#2115) removed it as an obsolete Flask-era guard while de-flaking the suite — flask is not a workers dependency. feat had only wrapped the same reload-based test in a namespace snapshot. Net: −1 test, suite still collects (20 tests).
workers/uv.lock	Take main's litellm 1.90.3 (from 1.85.1)	Forward bump. uv lock --check confirms the lock is consistent with the merged manifest (268 packages, no update needed).

Everything else auto-merged (settings/base.py, docker-compose, tests/groups.yaml, rig/cli.py, root uv.lock, …).

Verification

• uv lock --check (workers) — clean
• py_compile + pytest --collect-only on the resolved test file — 20 tests collect
• No conflict markers remain anywhere in the tree

🤖 Generated with Claude Code

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 60a50203-6254-48cb-b23d-4a341688684e

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch backmerge/main-into-feat-20260714

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[greptile-apps]

Greptile Summary

This PR backmerges 23 commits from main into the feat/UN-3445-pg-queue-integration branch, resolving two conflicts (deletion of an obsolete Flask guard test and a litellm lock bump) deterministically. The incoming changes span several independently landed features.

• Org controlled-mode flags (restrict_llm_adapter_creation, restrict_connector_creation): two new boolean columns (migrations 0006/0007), enforced in AdapterInstanceViewSet and ConnectorInstanceViewSet with service-account bypass and explicit org-binding on save to close a payload-override path.
• Platform API key rotation (CanRotatePlatformApiKey): a new permission restricts key-based rotation to full_access tier only, preventing a lower-tier key from reading a newly-rotated higher-tier secret; session callers still require admin.
• Deployment staging failure fix (deployment_helper.py): pre-dispatch file-staging failures now mark the execution ERROR and release the rate-limit slot, instead of leaving the row stuck as PENDING; error-marking failure is isolated so cleanup always runs.
• Postman collection improvements: collection variables and a post-response capture script auto-propagate execution_id from the execute response to the status request.
• Prompt-service → backend collapse: PROMPT_HOST/PROMPT_PORT removed from ToolsUtils and ToolRuntimeVariable.

Confidence Score: 4/5

Safe to merge; all conflict resolutions are deterministic and all incoming logic changes carry their own test coverage.

The deployment staging fix, org controlled-mode flags, and key-rotation permission are well-isolated and each backed by new test suites. The two minor observations (xfail strict=True CI trap and non-JSON content-type coercion in organization_settings) are not blocking. The prompt-service variable removal is a clean deletion with no remaining callers. No data-loss or auth-bypass paths were found.

backend/workflow_manager/endpoint_v2/tests/destination-connectors/test_destination_connector_postgres.py (xfail strict marker) and backend/tenant_account_v2/views.py (content-type constraint on the settings endpoint).

Important Files Changed

Filename	Overview
backend/tenant_account_v2/views.py	Adds GET/PATCH organization_settings endpoint guarded by IsOrganizationAdmin; two-pass validation (check then mutate) is correct; update_fields correctly lists auto_now field.
backend/adapter_processor_v2/views.py	Adds _enforce_llm_creation_restriction called after serializer validation (needs adapter_type from validated data); service-account bypass is correct; org is explicitly bound on save.
backend/connector_v2/views.py	Adds _enforce_connector_creation_restriction called before serializer validation (no adapter type needed); org bound explicitly on save to prevent payload bypass.
backend/platform_api/permissions.py	New CanRotatePlatformApiKey permission correctly restricts key-based rotation to full_access tier to prevent privilege escalation; session path delegates to IsOrganizationAdmin.
backend/api_v2/deployment_helper.py	Wraps file-staging in a scoped try/except so a pre-dispatch failure marks the execution ERROR and cleans up; error-marking failure is also isolated so cleanup always runs.
backend/api_v2/postman_collection/dto.py	Adds Postman collection variables and post-response script to auto-capture execution_id; {{execution_id}} variable syntax derived from constant to prevent drift; empty event blocks stripped in to_dict.
backend/workflow_manager/endpoint_v2/tests/destination-connectors/test_destination_connector_postgres.py	Adds @pytest.mark.xfail(strict=True) to document a known None→jsonb bug; strict mode means CI breaks with XPASS if bug is fixed without removing the marker.
unstract/workflow-execution/src/unstract/workflow_execution/tools_utils.py	Removes prompt_host/prompt_port env var reads as part of prompt-service → backend collapse; matching constants removed from ToolRuntimeVariable.
backend/account_v2/models.py	Adds two boolean controlled-mode flags with default=False; migrations 0006/0007 are chained correctly.
workers/tests/test_legacy_executor_scaffold.py	Removes test_no_flask_import as resolved conflict: main deleted the obsolete Flask-era guard; 20 tests remain collectible.

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    A[API Deployment POST] --> B{Auth valid?}
    B -- No --> C[403/401/404]
    B -- Yes --> D[Create WorkflowExecution PENDING]
    D --> E{Stage files in API storage}
    E -- failure --> F[mark execution ERROR]
    F --> G[Release rate-limit slot]
    G --> H[Delete API storage dir]
    H --> I[Return ERROR response]
    E -- success --> J[execute_workflow_async]
    J -- dispatch error --> K[Release slot + cleanup]
    J -- success --> L[Return PENDING/COMPLETED response]

    subgraph Org Controlled Mode
        M[LLM Adapter Create] --> N{restrict_llm_adapter_creation?}
        N -- True + not admin --> O[403 PermissionDenied]
        N -- False or admin --> P[Save with org binding]
        Q[Connector Create] --> R{restrict_connector_creation?}
        R -- True + not admin --> S[403 PermissionDenied]
        R -- False or admin --> T[Save with org binding]
    end

    subgraph Key Rotation
        U[PATCH platform-api-key/rotate] --> V{Platform API key?}
        V -- Yes --> W{full_access?}
        W -- No --> X[403]
        W -- Yes --> Y[Rotate key]
        V -- No --> Z{Session admin?}
        Z -- No --> X
        Z -- Yes --> Y
    end

Loading

%%{init: {'theme': 'base', 'themeVariables': {"darkMode": true, "background": "#0d1117", "primaryColor": "#21262d", "primaryTextColor": "#e6edf3", "primaryBorderColor": "#8b949e", "lineColor": "#8b949e", "textColor": "#e6edf3", "edgeLabelBackground": "#161b22", "actorBkg": "#21262d", "actorBorder": "#8b949e", "actorTextColor": "#e6edf3", "actorLineColor": "#8b949e", "signalColor": "#8b949e", "signalTextColor": "#e6edf3", "noteBkgColor": "#373320", "noteBorderColor": "#d4a72c", "noteTextColor": "#f0e6c0", "labelBoxBkgColor": "#21262d", "labelBoxBorderColor": "#8b949e", "labelTextColor": "#e6edf3", "loopTextColor": "#e6edf3", "activationBkgColor": "#30363d", "activationBorderColor": "#8b949e"}}}%%
flowchart TD
    A[API Deployment POST] --> B{Auth valid?}
    B -- No --> C[403/401/404]
    B -- Yes --> D[Create WorkflowExecution PENDING]
    D --> E{Stage files in API storage}
    E -- failure --> F[mark execution ERROR]
    F --> G[Release rate-limit slot]
    G --> H[Delete API storage dir]
    H --> I[Return ERROR response]
    E -- success --> J[execute_workflow_async]
    J -- dispatch error --> K[Release slot + cleanup]
    J -- success --> L[Return PENDING/COMPLETED response]

    subgraph Org Controlled Mode
        M[LLM Adapter Create] --> N{restrict_llm_adapter_creation?}
        N -- True + not admin --> O[403 PermissionDenied]
        N -- False or admin --> P[Save with org binding]
        Q[Connector Create] --> R{restrict_connector_creation?}
        R -- True + not admin --> S[403 PermissionDenied]
        R -- False or admin --> T[Save with org binding]
    end

    subgraph Key Rotation
        U[PATCH platform-api-key/rotate] --> V{Platform API key?}
        V -- Yes --> W{full_access?}
        W -- No --> X[403]
        W -- Yes --> Y[Rotate key]
        V -- No --> Z{Session admin?}
        Z -- No --> X
        Z -- Yes --> Y
    end

Loading

Prompt To Fix All With AI

Fix the following 2 code review issues. Work through them one at a time, proposing concise fixes.

---

### Issue 1 of 2
backend/workflow_manager/endpoint_v2/tests/destination-connectors/test_destination_connector_postgres.py:193-205
**`xfail(strict=True)` will break CI when the bug is fixed without touching this file**

`strict=True` means the test is expected to fail; if the underlying `None → SQL NULL` fix lands (removing the `'None'` literal serialisation), the test will unexpectedly pass and pytest reports it as `XPASS → FAILED`. The CI failure message will be "test_insert_into_db_with_error_postgresql unexpectedly passed", which is easy to misread. Consider adding the Jira/GH issue reference to the `reason` string so the next developer immediately knows which ticket to check and what to remove.

### Issue 2 of 2
backend/tenant_account_v2/views.py:66-114
**Boolean coercion fails silently for non-JSON content types**

`isinstance(value, bool)` correctly rejects integers and strings when the request body is JSON (DRF's JSON parser produces Python `bool`). However, if a caller sends the same body as `application/x-www-form-urlencoded` or `multipart/form-data`, DRF parses every value as a string (`"true"` / `"false"`), and the check returns a 400 with a message like `"restrict_llm_adapter_creation must be a boolean"`. The endpoint could add a `parser_classes = [JSONParser]` declaration to make the contract explicit and prevent the confusing error.

_{Reviews (1): Last reviewed commit: "UN-3445 [MISC] backmerge main into feat ..." | Re-trigger Greptile}

[greptile-apps]

xfail(strict=True) will break CI when the bug is fixed without touching this file

strict=True means the test is expected to fail; if the underlying None → SQL NULL fix lands (removing the 'None' literal serialisation), the test will unexpectedly pass and pytest reports it as XPASS → FAILED. The CI failure message will be "test_insert_into_db_with_error_postgresql unexpectedly passed", which is easy to misread. Consider adding the Jira/GH issue reference to the reason string so the next developer immediately knows which ticket to check and what to remove.

Prompt To Fix With AI

This is a comment left during a code review.
Path: backend/workflow_manager/endpoint_v2/tests/destination-connectors/test_destination_connector_postgres.py
Line: 193-205

Comment:
**`xfail(strict=True)` will break CI when the bug is fixed without touching this file**

`strict=True` means the test is expected to fail; if the underlying `None → SQL NULL` fix lands (removing the `'None'` literal serialisation), the test will unexpectedly pass and pytest reports it as `XPASS → FAILED`. The CI failure message will be "test_insert_into_db_with_error_postgresql unexpectedly passed", which is easy to misread. Consider adding the Jira/GH issue reference to the `reason` string so the next developer immediately knows which ticket to check and what to remove.

How can I resolve this? If you propose a fix, please make it concise.

Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!

[greptile-apps]

Boolean coercion fails silently for non-JSON content types

isinstance(value, bool) correctly rejects integers and strings when the request body is JSON (DRF's JSON parser produces Python bool). However, if a caller sends the same body as application/x-www-form-urlencoded or multipart/form-data, DRF parses every value as a string ("true" / "false"), and the check returns a 400 with a message like "restrict_llm_adapter_creation must be a boolean". The endpoint could add a parser_classes = [JSONParser] declaration to make the contract explicit and prevent the confusing error.

Prompt To Fix With AI

This is a comment left during a code review.
Path: backend/tenant_account_v2/views.py
Line: 66-114

Comment:
**Boolean coercion fails silently for non-JSON content types**

`isinstance(value, bool)` correctly rejects integers and strings when the request body is JSON (DRF's JSON parser produces Python `bool`). However, if a caller sends the same body as `application/x-www-form-urlencoded` or `multipart/form-data`, DRF parses every value as a string (`"true"` / `"false"`), and the check returns a 400 with a message like `"restrict_llm_adapter_creation must be a boolean"`. The endpoint could add a `parser_classes = [JSONParser]` declaration to make the contract explicit and prevent the confusing error.

How can I resolve this? If you propose a fix, please make it concise.