From dcb91e976882098fee75de68d85aff272bd4f4f1 Mon Sep 17 00:00:00 2001 From: kirtimanmishrazipstack Date: Wed, 28 Feb 2024 18:09:47 +0530 Subject: [PATCH 1/6] init changes --- ...0005_alter_adapterinstance_adapter_type.py | 27 ++++++++++++++++ ...torinstance_connector_metadata_and_more.py | 20 ++++++++++++ ...04_connectorinstance_connector_metadata.py | 26 ++++++++++++++++ backend/connector/models.py | 12 ++++--- backend/connector/serializers.py | 24 +------------- pdm.lock | 31 ++++++++++++++++++- pyproject.toml | 1 + 7 files changed, 113 insertions(+), 28 deletions(-) create mode 100644 backend/adapter_processor/migrations/0005_alter_adapterinstance_adapter_type.py create mode 100644 backend/connector/migrations/0003_remove_connectorinstance_connector_metadata_and_more.py create mode 100644 backend/connector/migrations/0004_connectorinstance_connector_metadata.py diff --git a/backend/adapter_processor/migrations/0005_alter_adapterinstance_adapter_type.py b/backend/adapter_processor/migrations/0005_alter_adapterinstance_adapter_type.py new file mode 100644 index 0000000000..2849199805 --- /dev/null +++ b/backend/adapter_processor/migrations/0005_alter_adapterinstance_adapter_type.py @@ -0,0 +1,27 @@ +# Generated by Django 4.2.1 on 2024-02-28 12:19 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("adapter_processor", "0004_alter_adapterinstance_adapter_type"), + ] + + operations = [ + migrations.AlterField( + model_name="adapterinstance", + name="adapter_type", + field=models.CharField( + choices=[ + ("UNKNOWN", "UNKNOWN"), + ("LLM", "LLM"), + ("EMBEDDING", "EMBEDDING"), + ("VECTOR_DB", "VECTOR_DB"), + ("OCR", "OCR"), + ("X2TEXT", "X2TEXT"), + ], + db_comment="Type of adapter LLM/EMBEDDING/VECTOR_DB", + ), + ), + ] diff --git a/backend/connector/migrations/0003_remove_connectorinstance_connector_metadata_and_more.py b/backend/connector/migrations/0003_remove_connectorinstance_connector_metadata_and_more.py new file mode 100644 index 0000000000..c566eba63d --- /dev/null +++ b/backend/connector/migrations/0003_remove_connectorinstance_connector_metadata_and_more.py @@ -0,0 +1,20 @@ +# Generated by Django 4.2.1 on 2024-02-28 12:36 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("connector", "0002_connectorinstance_connector_metadata_b"), + ] + + operations = [ + migrations.RemoveField( + model_name="connectorinstance", + name="connector_metadata", + ), + migrations.RemoveField( + model_name="connectorinstance", + name="connector_metadata_b", + ), + ] diff --git a/backend/connector/migrations/0004_connectorinstance_connector_metadata.py b/backend/connector/migrations/0004_connectorinstance_connector_metadata.py new file mode 100644 index 0000000000..d2cbeaee08 --- /dev/null +++ b/backend/connector/migrations/0004_connectorinstance_connector_metadata.py @@ -0,0 +1,26 @@ +# Generated by Django 4.2.1 on 2024-02-28 12:37 + +import connector.fields +import django_cryptography.fields +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ( + "connector", + "0003_remove_connectorinstance_connector_metadata_and_more", + ), + ] + + operations = [ + migrations.AddField( + model_name="connectorinstance", + name="connector_metadata", + field=django_cryptography.fields.encrypt( + connector.fields.ConnectorAuthJSONField( + db_column="connector_metadata", default=dict + ) + ), + ), + ] diff --git a/backend/connector/models.py b/backend/connector/models.py index cc58ee5be9..010d78b0bf 100644 --- a/backend/connector/models.py +++ b/backend/connector/models.py @@ -6,6 +6,7 @@ from connector_processor.connector_processor import ConnectorProcessor from connector_processor.constants import ConnectorKeys from django.db import models +from django_cryptography.fields import encrypt from project.models import Project from utils.models.base_model import BaseModel from workflow_manager.workflow.models import Workflow @@ -47,11 +48,14 @@ class ConnectorMode(models.IntegerChoices): connector_id = models.CharField( max_length=FLC.CONNECTOR_ID_LENGTH, default="" ) - # TODO Required to be removed - connector_metadata = ConnectorAuthJSONField( - db_column="connector_metadata", null=False, blank=False, default=dict + connector_metadata = encrypt( + ConnectorAuthJSONField( + db_column="connector_metadata", + null=False, + blank=False, + default=dict, + ) ) - connector_metadata_b = models.BinaryField(null=True) connector_version = models.CharField( max_length=VERSION_NAME_SIZE, default="" ) diff --git a/backend/connector/serializers.py b/backend/connector/serializers.py index 4b664cb67f..127084f36e 100644 --- a/backend/connector/serializers.py +++ b/backend/connector/serializers.py @@ -1,16 +1,13 @@ -import json import logging from collections import OrderedDict from typing import Any, Optional -from account.models import EncryptionSecret from connector.constants import ConnectorInstanceKey as CIKey from connector_auth.models import ConnectorAuth from connector_auth.pipeline.common import ConnectorAuthHelper from connector_processor.connector_processor import ConnectorProcessor from connector_processor.constants import ConnectorKeys from connector_processor.exceptions import OAuthTimeOut -from cryptography.fernet import Fernet from utils.serializer_utils import SerializerUtils from backend.serializers import AuditSerializer @@ -54,17 +51,6 @@ def save(self, **kwargs): # type: ignore connector_id, CIKey.CONNECTOR_MODE ) kwargs[CIKey.CONNECTOR_MODE] = connector_mode.value - - encryption_secret: EncryptionSecret = EncryptionSecret.objects.get() - f: Fernet = Fernet(encryption_secret.key.encode("utf-8")) - json_string: str = json.dumps(kwargs.pop(CIKey.CONNECTOR_METADATA)) - if self.validated_data: - self.validated_data.pop(CIKey.CONNECTOR_METADATA) - - kwargs[CIKey.CONNECTOR_METADATA_B] = f.encrypt( - json_string.encode("utf-8") - ) - instance = super().save(**kwargs) return instance @@ -81,13 +67,5 @@ def to_representation(self, instance: ConnectorInstance) -> dict[str, str]: ] = ConnectorProcessor.get_connector_data_with_key( instance.connector_id, ConnectorKeys.ICON ) - encryption_secret: EncryptionSecret = EncryptionSecret.objects.get() - f: Fernet = Fernet(encryption_secret.key.encode("utf-8")) - - rep.pop(CIKey.CONNECTOR_METADATA_B) - if instance.connector_metadata_b: - adapter_metadata = json.loads( - f.decrypt(bytes(instance.connector_metadata_b).decode("utf-8")) - ) - rep[CIKey.CONNECTOR_METADATA] = adapter_metadata + rep[CIKey.CONNECTOR_METADATA] = instance.connector_metadata return rep diff --git a/pdm.lock b/pdm.lock index a617b0be0f..18432abd92 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,7 +5,7 @@ groups = ["default", "hook-check-django-migrations", "lint"] strategy = ["cross_platform", "inherit_metadata"] lock_version = "4.4.1" -content_hash = "sha256:34bd617283cb8620b48d2ff82e83a4721d9464962bb6ccebd4d9f860efaed221" +content_hash = "sha256:ca55c6346c89085c84b9b0d2303ef8034868e701652d8e1c8fcac140ed92a865" [[package]] name = "absolufy-imports" @@ -936,6 +936,20 @@ files = [ {file = "Django-4.2.1.tar.gz", hash = "sha256:7efa6b1f781a6119a10ac94b4794ded90db8accbe7802281cd26f8664ffed59c"}, ] +[[package]] +name = "django-appconf" +version = "1.0.6" +requires_python = ">=3.7" +summary = "A helper class for handling configuration defaults of packaged apps gracefully." +groups = ["hook-check-django-migrations"] +dependencies = [ + "django", +] +files = [ + {file = "django-appconf-1.0.6.tar.gz", hash = "sha256:cfe87ea827c4ee04b9a70fab90b86d704cb02f2981f89da8423cb0fabf88efbf"}, + {file = "django_appconf-1.0.6-py3-none-any.whl", hash = "sha256:c3ae442fba1ff7ec830412c5184b17169a7a1e71cf0864a4c3f93cf4c98a1993"}, +] + [[package]] name = "django-celery-beat" version = "2.5.0" @@ -969,6 +983,21 @@ files = [ {file = "django_cors_headers-4.3.1-py3-none-any.whl", hash = "sha256:0b1fd19297e37417fc9f835d39e45c8c642938ddba1acce0c1753d3edef04f36"}, ] +[[package]] +name = "django-cryptography" +version = "1.1" +requires_python = ">=3.6" +summary = "Easily encrypt data in Django" +groups = ["hook-check-django-migrations"] +dependencies = [ + "Django", + "cryptography", + "django-appconf", +] +files = [ + {file = "django_cryptography-1.1-py2.py3-none-any.whl", hash = "sha256:93702fcf0d75865d55362f20ecd95274c4eef60ccdce46cbdade0420acee07cb"}, +] + [[package]] name = "django-redis" version = "5.4.0" diff --git a/pyproject.toml b/pyproject.toml index e8c3160f42..db2a3ed41d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,6 +43,7 @@ hook-check-django-migrations = [ "python-magic==0.4.27", "unstract-sdk~=0.11.2", "unstract-adapters~=0.2.2", + "django-cryptography==1.1", "-e unstract-connectors @ file:///${PROJECT_ROOT}/unstract/connectors", "-e unstract-core @ file:///${PROJECT_ROOT}/unstract/core", "-e unstract-flags @ file:///${PROJECT_ROOT}/unstract/flags", From 64216d602615c5d70b94689c6663c524fffef6b8 Mon Sep 17 00:00:00 2001 From: kirtimanmishrazipstack Date: Wed, 28 Feb 2024 19:10:40 +0530 Subject: [PATCH 2/6] changes --- backend/pdm.lock | 48 +++++++++++++++---- backend/pyproject.toml | 1 + .../workflow_manager/endpoint/destination.py | 13 ----- backend/workflow_manager/endpoint/source.py | 15 ------ 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/backend/pdm.lock b/backend/pdm.lock index da10551b77..1957e47878 100644 --- a/backend/pdm.lock +++ b/backend/pdm.lock @@ -5,7 +5,7 @@ groups = ["default", "test", "deploy"] strategy = ["cross_platform", "inherit_metadata"] lock_version = "4.4.1" -content_hash = "sha256:73a791002f5f7bab1afe9eaee07e8fc946774da3448f9daabedbccfc9be4f202" +content_hash = "sha256:51e64bf1cd4ccd937aea09639902c55251bef3948ef2f52daafcd4b8870ee3c4" [[package]] name = "aiobotocore" @@ -319,7 +319,6 @@ version = "4.0.3" requires_python = ">=3.7" summary = "Timeout context manager for asyncio programs" groups = ["default"] -marker = "python_version < \"3.12.0\"" files = [ {file = "async-timeout-4.0.3.tar.gz", hash = "sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f"}, {file = "async_timeout-4.0.3-py3-none-any.whl", hash = "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028"}, @@ -864,6 +863,20 @@ files = [ {file = "Django-4.2.1.tar.gz", hash = "sha256:7efa6b1f781a6119a10ac94b4794ded90db8accbe7802281cd26f8664ffed59c"}, ] +[[package]] +name = "django-appconf" +version = "1.0.6" +requires_python = ">=3.7" +summary = "A helper class for handling configuration defaults of packaged apps gracefully." +groups = ["default"] +dependencies = [ + "django", +] +files = [ + {file = "django-appconf-1.0.6.tar.gz", hash = "sha256:cfe87ea827c4ee04b9a70fab90b86d704cb02f2981f89da8423cb0fabf88efbf"}, + {file = "django_appconf-1.0.6-py3-none-any.whl", hash = "sha256:c3ae442fba1ff7ec830412c5184b17169a7a1e71cf0864a4c3f93cf4c98a1993"}, +] + [[package]] name = "django-celery-beat" version = "2.5.0" @@ -897,6 +910,21 @@ files = [ {file = "django_cors_headers-4.3.1-py3-none-any.whl", hash = "sha256:0b1fd19297e37417fc9f835d39e45c8c642938ddba1acce0c1753d3edef04f36"}, ] +[[package]] +name = "django-cryptography" +version = "1.1" +requires_python = ">=3.6" +summary = "Easily encrypt data in Django" +groups = ["default"] +dependencies = [ + "Django", + "cryptography", + "django-appconf", +] +files = [ + {file = "django_cryptography-1.1-py2.py3-none-any.whl", hash = "sha256:93702fcf0d75865d55362f20ecd95274c4eef60ccdce46cbdade0420acee07cb"}, +] + [[package]] name = "django-redis" version = "5.4.0" @@ -1593,7 +1621,7 @@ files = [ [[package]] name = "gotrue" -version = "2.1.0" +version = "2.4.1" requires_python = ">=3.8,<4.0" summary = "Python Client Library for GoTrue" groups = ["default"] @@ -1602,8 +1630,8 @@ dependencies = [ "pydantic<3,>=1.10", ] files = [ - {file = "gotrue-2.1.0-py3-none-any.whl", hash = "sha256:6483d9a3ac9be1d1ad510be24171e133aa1cec702cc10a8f323b9e7519642447"}, - {file = "gotrue-2.1.0.tar.gz", hash = "sha256:b21d48ee64f0f6a1ed111efe4871a83e542529f1a75a264833b50e6433cd3c98"}, + {file = "gotrue-2.4.1-py3-none-any.whl", hash = "sha256:9647bb7a585c969d26667df21168fa20b18f91c5d6afe286af08d7a0610fd2cc"}, + {file = "gotrue-2.4.1.tar.gz", hash = "sha256:8b260ef285f45a3a2f9b5a006f12afb9fad7a36a28fa277f19e733f22eb88584"}, ] [[package]] @@ -3441,16 +3469,16 @@ files = [ [[package]] name = "redis" -version = "5.0.1" +version = "5.0.2" requires_python = ">=3.7" summary = "Python client for Redis database and key-value store" groups = ["default"] dependencies = [ - "async-timeout>=4.0.2; python_full_version <= \"3.11.2\"", + "async-timeout>=4.0.3", ] files = [ - {file = "redis-5.0.1-py3-none-any.whl", hash = "sha256:ed4802971884ae19d640775ba3b03aa2e7bd5e8fb8dfaed2decce4d0fc48391f"}, - {file = "redis-5.0.1.tar.gz", hash = "sha256:0dab495cd5753069d3bc650a0dde8a8f9edde16fc5691b689a566eda58100d0f"}, + {file = "redis-5.0.2-py3-none-any.whl", hash = "sha256:4caa8e1fcb6f3c0ef28dba99535101d80934b7d4cd541bbb47f4a3826ee472d1"}, + {file = "redis-5.0.2.tar.gz", hash = "sha256:3f82cc80d350e93042c8e6e7a5d0596e4dd68715babffba79492733e1f367037"}, ] [[package]] @@ -4700,7 +4728,7 @@ dependencies = [ "docker~=6.1.3", "jsonschema~=4.18.2", "unstract-adapters~=0.2.1", - "unstract-tool-sandbox @ file:///home/gayathrivijayakumar/code/Unstract/unstract/unstract/tool-registry/../tool-sandbox", + "unstract-tool-sandbox @ file:///home/kirtimanmishra/Zipstack/Repositories/unstract/unstract/tool-registry/../tool-sandbox", ] [[package]] diff --git a/backend/pyproject.toml b/backend/pyproject.toml index 9494a1fdaa..1483289d0a 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -32,6 +32,7 @@ dependencies = [ "social-auth-core==4.4.2", # For OAuth "unstract-sdk~=0.11.2", "unstract-adapters~=0.2.2", + "django-cryptography==1.1", # ! 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/workflow_manager/endpoint/destination.py b/backend/workflow_manager/endpoint/destination.py index 2fb16eb039..1bd24726d1 100644 --- a/backend/workflow_manager/endpoint/destination.py +++ b/backend/workflow_manager/endpoint/destination.py @@ -6,9 +6,7 @@ import fsspec import magic -from account.models import EncryptionSecret from connector.models import ConnectorInstance -from cryptography.fernet import Fernet from django.db import connection from fsspec.implementations.local import LocalFileSystem from unstract.sdk.constants import ToolExecKey @@ -77,17 +75,6 @@ def _get_endpoint_for_workflow( workflow=workflow, endpoint_type=WorkflowEndpoint.EndpointType.DESTINATION, ) - if endpoint.connector_instance: - encryption_secret: EncryptionSecret = EncryptionSecret.objects.get() - f: Fernet = Fernet(encryption_secret.key.encode("utf-8")) - endpoint.connector_instance.connector_metadata = json.loads( - f.decrypt( - bytes(endpoint.connector_instance.connector_metadata_b - ).decode( - "utf-8" - ) - ) - ) return endpoint def validate(self) -> None: diff --git a/backend/workflow_manager/endpoint/source.py b/backend/workflow_manager/endpoint/source.py index 7e9e3fd035..f7e5bacbf7 100644 --- a/backend/workflow_manager/endpoint/source.py +++ b/backend/workflow_manager/endpoint/source.py @@ -1,5 +1,4 @@ import fnmatch -import json import logging import os import shutil @@ -8,10 +7,8 @@ from typing import Any, Optional import fsspec -from account.models import EncryptionSecret from connector.models import ConnectorInstance from connector_processor.constants import ConnectorKeys -from cryptography.fernet import Fernet from django.core.files.uploadedfile import UploadedFile from django.db import connection from unstract.workflow_execution.enums import LogState @@ -92,18 +89,6 @@ def _get_endpoint_for_workflow( workflow=workflow, endpoint_type=WorkflowEndpoint.EndpointType.SOURCE, ) - if endpoint.connector_instance: - encryption_secret: EncryptionSecret = EncryptionSecret.objects.get() - f: Fernet = Fernet(encryption_secret.key.encode("utf-8")) - endpoint.connector_instance.connector_metadata = json.loads( - f.decrypt( - bytes(endpoint.connector_instance.connector_metadata_b - ).decode( - "utf-8" - ) - ) - ) - return endpoint def validate(self) -> None: From 48456570b4d1f11e74f9a9d4afd24c6bf1e14e73 Mon Sep 17 00:00:00 2001 From: kirtimanmishrazipstack Date: Wed, 28 Feb 2024 20:06:14 +0530 Subject: [PATCH 3/6] removing unused migration --- ...0005_alter_adapterinstance_adapter_type.py | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 backend/adapter_processor/migrations/0005_alter_adapterinstance_adapter_type.py diff --git a/backend/adapter_processor/migrations/0005_alter_adapterinstance_adapter_type.py b/backend/adapter_processor/migrations/0005_alter_adapterinstance_adapter_type.py deleted file mode 100644 index 2849199805..0000000000 --- a/backend/adapter_processor/migrations/0005_alter_adapterinstance_adapter_type.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 4.2.1 on 2024-02-28 12:19 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("adapter_processor", "0004_alter_adapterinstance_adapter_type"), - ] - - operations = [ - migrations.AlterField( - model_name="adapterinstance", - name="adapter_type", - field=models.CharField( - choices=[ - ("UNKNOWN", "UNKNOWN"), - ("LLM", "LLM"), - ("EMBEDDING", "EMBEDDING"), - ("VECTOR_DB", "VECTOR_DB"), - ("OCR", "OCR"), - ("X2TEXT", "X2TEXT"), - ], - db_comment="Type of adapter LLM/EMBEDDING/VECTOR_DB", - ), - ), - ] From cc1960ce03b765191750763517f071d57ca56ba6 Mon Sep 17 00:00:00 2001 From: kirtimanmishrazipstack Date: Wed, 28 Feb 2024 20:23:39 +0530 Subject: [PATCH 4/6] adding migration for adapter --- ...0005_alter_adapterinstance_adapter_type.py | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 backend/adapter_processor/migrations/0005_alter_adapterinstance_adapter_type.py diff --git a/backend/adapter_processor/migrations/0005_alter_adapterinstance_adapter_type.py b/backend/adapter_processor/migrations/0005_alter_adapterinstance_adapter_type.py new file mode 100644 index 0000000000..a51ba9b844 --- /dev/null +++ b/backend/adapter_processor/migrations/0005_alter_adapterinstance_adapter_type.py @@ -0,0 +1,27 @@ +# Generated by Django 4.2.1 on 2024-02-28 14:43 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("adapter_processor", "0004_alter_adapterinstance_adapter_type"), + ] + + operations = [ + migrations.AlterField( + model_name="adapterinstance", + name="adapter_type", + field=models.CharField( + choices=[ + ("UNKNOWN", "UNKNOWN"), + ("LLM", "LLM"), + ("EMBEDDING", "EMBEDDING"), + ("VECTOR_DB", "VECTOR_DB"), + ("OCR", "OCR"), + ("X2TEXT", "X2TEXT"), + ], + db_comment="Type of adapter LLM/EMBEDDING/VECTOR_DB", + ), + ), + ] From 787adab375c55013bceba785e19088651b483b21 Mon Sep 17 00:00:00 2001 From: kirtimanmishrazipstack Date: Wed, 28 Feb 2024 20:34:23 +0530 Subject: [PATCH 5/6] removing django-cryptography on root --- pdm.lock | 31 +------------------------------ pyproject.toml | 1 - 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/pdm.lock b/pdm.lock index 18432abd92..a617b0be0f 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,7 +5,7 @@ groups = ["default", "hook-check-django-migrations", "lint"] strategy = ["cross_platform", "inherit_metadata"] lock_version = "4.4.1" -content_hash = "sha256:ca55c6346c89085c84b9b0d2303ef8034868e701652d8e1c8fcac140ed92a865" +content_hash = "sha256:34bd617283cb8620b48d2ff82e83a4721d9464962bb6ccebd4d9f860efaed221" [[package]] name = "absolufy-imports" @@ -936,20 +936,6 @@ files = [ {file = "Django-4.2.1.tar.gz", hash = "sha256:7efa6b1f781a6119a10ac94b4794ded90db8accbe7802281cd26f8664ffed59c"}, ] -[[package]] -name = "django-appconf" -version = "1.0.6" -requires_python = ">=3.7" -summary = "A helper class for handling configuration defaults of packaged apps gracefully." -groups = ["hook-check-django-migrations"] -dependencies = [ - "django", -] -files = [ - {file = "django-appconf-1.0.6.tar.gz", hash = "sha256:cfe87ea827c4ee04b9a70fab90b86d704cb02f2981f89da8423cb0fabf88efbf"}, - {file = "django_appconf-1.0.6-py3-none-any.whl", hash = "sha256:c3ae442fba1ff7ec830412c5184b17169a7a1e71cf0864a4c3f93cf4c98a1993"}, -] - [[package]] name = "django-celery-beat" version = "2.5.0" @@ -983,21 +969,6 @@ files = [ {file = "django_cors_headers-4.3.1-py3-none-any.whl", hash = "sha256:0b1fd19297e37417fc9f835d39e45c8c642938ddba1acce0c1753d3edef04f36"}, ] -[[package]] -name = "django-cryptography" -version = "1.1" -requires_python = ">=3.6" -summary = "Easily encrypt data in Django" -groups = ["hook-check-django-migrations"] -dependencies = [ - "Django", - "cryptography", - "django-appconf", -] -files = [ - {file = "django_cryptography-1.1-py2.py3-none-any.whl", hash = "sha256:93702fcf0d75865d55362f20ecd95274c4eef60ccdce46cbdade0420acee07cb"}, -] - [[package]] name = "django-redis" version = "5.4.0" diff --git a/pyproject.toml b/pyproject.toml index db2a3ed41d..e8c3160f42 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,6 @@ hook-check-django-migrations = [ "python-magic==0.4.27", "unstract-sdk~=0.11.2", "unstract-adapters~=0.2.2", - "django-cryptography==1.1", "-e unstract-connectors @ file:///${PROJECT_ROOT}/unstract/connectors", "-e unstract-core @ file:///${PROJECT_ROOT}/unstract/core", "-e unstract-flags @ file:///${PROJECT_ROOT}/unstract/flags", From 251463dfeb9d1cae7c180416e11ac69ed1208e21 Mon Sep 17 00:00:00 2001 From: kirtimanmishrazipstack Date: Wed, 28 Feb 2024 21:04:35 +0530 Subject: [PATCH 6/6] adding backend/pdm lock --- backend/pdm.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/pdm.lock b/backend/pdm.lock index 1957e47878..05dbf21a93 100644 --- a/backend/pdm.lock +++ b/backend/pdm.lock @@ -3618,7 +3618,7 @@ files = [ [[package]] name = "rich" -version = "13.7.0" +version = "13.7.1" requires_python = ">=3.7.0" summary = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" groups = ["default"] @@ -3627,8 +3627,8 @@ dependencies = [ "pygments<3.0.0,>=2.13.0", ] files = [ - {file = "rich-13.7.0-py3-none-any.whl", hash = "sha256:6da14c108c4866ee9520bbffa71f6fe3962e193b7da68720583850cd4548e235"}, - {file = "rich-13.7.0.tar.gz", hash = "sha256:5cb5123b5cf9ee70584244246816e9114227e0b98ad9176eede6ad54bf5403fa"}, + {file = "rich-13.7.1-py3-none-any.whl", hash = "sha256:4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222"}, + {file = "rich-13.7.1.tar.gz", hash = "sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432"}, ] [[package]]