Skip to content

v2 changes of PromptStudo-Registry#478

Merged
hari-kuriakose merged 3 commits into
mainfrom
feat/MultiTenancyV2-PromptStudo-Registry
Jul 18, 2024
Merged

v2 changes of PromptStudo-Registry#478
hari-kuriakose merged 3 commits into
mainfrom
feat/MultiTenancyV2-PromptStudo-Registry

Conversation

@muhammad-ali-e

@muhammad-ali-e muhammad-ali-e commented Jul 11, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

NOTE

  • This PR is intended to make a copy of the existing applications to facilitate the transition to v2. It does not aim to change or optimize the existing code.
  • Review comments can be added as TODO items for future enhancements.

What

  • Introduced v2 changes for the prompt_studio.prompt_studio_registry application.

Why

  • To align with the updated architecture and ensure compatibility with v2 applications.
  • To streamline the handling of organization contexts without relying on django_tenants.

How

  • Updated imports to reference v2 instead of v1 applications.
  • Revised the get_organization method to utilize the user context.
  • Renamed application in apps.py.
  • Added new models with updated table names.
  • Updated PromptStudioRegistry model with DefaultOrganizationMixin class.
  • Added PromptStudioRegistryModelManager with DefaultOrganizationManagerMixin to get the organization data in PromptStudioRegistry of prompt_studio_registry_v2.

Can this PR break any existing features. If yes, please list possible items. If no, please explain why. (PS: Admins do not merge the PR without this section filled)

  • The new methods are self-contained ensuring no impact on current functionality.

Database Migrations

Env Config

Relevant Docs

Related Issues or PRs

  1. unstract-multi-tenantV2 feature-flag changes #422
  2. Feat/multi tenancy v2 context and organization #430
  3. Version 2 of User/Organization Account Module #431
  4. version 2 of user/organization tenant account module - UN-1424 #432
  5. v2 changes of platform settings #447
  6. v2 changes of connector and connector_auth #461
  7. v2 changes of workflow with endpoints #464
  8. Feat/multi tenancy v2 adapter and connector processor #465
  9. v2 changes of Filemanagement And Scheduler #466
  10. v2 changes of pipeline and api #467
  11. v2 changes of tool_instance and usage #470
  12. v2 changes of ProfileManager,core and studio #471
  13. v2 changes of PromptStudo-Document-Index-Output-Managers #477

Dependencies Versions

Notes on Testing

Screenshots

Checklist

I have read and understood the Contribution Guidelines.

@muhammad-ali-e muhammad-ali-e requested review from a team, athul-rs, gaya3-vijayakumar, hari-kuriakose, harini-venkataraman, johnyrahul and vishnuszipstack and removed request for a team July 11, 2024 06:38
hari-kuriakose
hari-kuriakose approved these changes Jul 12, 2024
View reviewed changes

@hari-kuriakose hari-kuriakose left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@muhammad-ali-e Model looks good.

We can take care of duplication when we delete v1 eventually. Also, migration files can be generated together later.

gaya3-vijayakumar
gaya3-vijayakumar approved these changes Jul 12, 2024
View reviewed changes

@gaya3-vijayakumar gaya3-vijayakumar left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look fine.

vishnuszipstack
vishnuszipstack reviewed Jul 16, 2024
View reviewed changes
Comment thread backend/prompt_studio/prompt_studio_registry_v2/fields.py Outdated
vishnuszipstack
vishnuszipstack approved these changes Jul 16, 2024
View reviewed changes

@vishnuszipstack vishnuszipstack left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left a NIT comment. others looks good.

@github-actions

github-actions Bot commented Jul 18, 2024

Copy link
Copy Markdown
Contributor
filepath function $$\textcolor{#23d18b}{\tt{passed}}$$ SUBTOTAL
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_logs}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_cleanup}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_cleanup\_skip}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_client\_init}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_get\_image\_exists}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_get\_image}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_get\_container\_run\_config}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_get\_container\_run\_config\_without\_mount}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{worker/src/unstract/worker/clients/test\_docker.py}}$$ $$\textcolor{#23d18b}{\tt{test\_run\_container}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{TOTAL}}$$ $$\textcolor{#23d18b}{\tt{9}}$$ $$\textcolor{#23d18b}{\tt{9}}$$

@sonarqubecloud

sonarqubecloud Bot commented Jul 18, 2024

Copy link
Copy Markdown

Quality Gate Failed Quality Gate failed

Failed conditions
66.3% Duplication on New Code (required ≤ 3%)

See analysis details on SonarCloud

@hari-kuriakose hari-kuriakose merged commit 5035622 into main Jul 18, 2024
@hari-kuriakose hari-kuriakose deleted the feat/MultiTenancyV2-PromptStudo-Registry branch July 18, 2024 14:52
pk-zipstack pushed a commit that referenced this pull request Aug 20, 2025
@muhammad-ali-e @hari-kuriakose
v2 changes of PromptStudo-Registry (#478)
e3ddc0d 
* v2 changes of PromptStudo-Registry

* addressed comments

---------

Co-authored-by: Hari John Kuriakose <hari@zipstack.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@harini-venkataraman harini-venkataraman harini-venkataraman approved these changes
@vishnuszipstack vishnuszipstack vishnuszipstack approved these changes
@hari-kuriakose hari-kuriakose hari-kuriakose approved these changes
@gaya3-vijayakumar gaya3-vijayakumar gaya3-vijayakumar approved these changes
@johnyrahul johnyrahul Awaiting requested review from johnyrahul
@athul-rs athul-rs Awaiting requested review from athul-rs

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@muhammad-ali-e @harini-venkataraman @vishnuszipstack @hari-kuriakose @gaya3-vijayakumar