Merge branch 'main' into feat/friction_less_onboarding

Signed-off-by: Rahul Johny <116638720+johnyrahul@users.noreply.github.com>
Zipstack · nehabagdia · Apr 29, 2024 · Apr 3, 2024 · Apr 9, 2024 · Apr 17, 2024
commit 8dc93068efaaa810d6330abe331bd434de97c7fc
diff --git a/backend/account/authentication_controller.py b/backend/account/authentication_controller.py
@@ -11,12 +11,9 @@
     ErrorMessage,
     OrganizationMemberModel,
 )
-from account.custom_exceptions import (
-    DuplicateData,
-    Forbidden,
-    MethodNotImplemented,
-    UserNotExistError,
-)
+
+from account.custom_exceptions import DuplicateData, Forbidden, UserNotExistError
+
 from account.dto import (
     MemberInvitation,
     OrganizationData,
@@ -414,19 +411,6 @@ def create_tenant_user(self, organization: Organization, user: User) -> None:
                 else:
                     raise UserNotExistError()
 
-    def get_or_create_user_by_email(
-        self, request: Request, callback_data: CallbackData
-    ) -> Union[User, OrganizationMember]:
-        email = callback_data.email
-        user_id = callback_data.user_id
-        user_service = UserService()
-        user: User | None = user_service.get_user_by_email(email)
-        if user and not user.user_id:
-            user = user_service.update_user(user, user_id)
-        if not user:
-
-            user = user_service.create_user(email, user_id)
-        return user
 
     def get_or_create_user(
         self, user: User

diff --git a/backend/account/authentication_service.py b/backend/account/authentication_service.py
@@ -256,14 +256,13 @@ def get_roles(self) -> list[UserRoleData]:
     def get_invitations(self, organization_id: str) -> list[MemberInvitation]:
         raise MethodNotImplemented()
 
+
     def frictionless_onboarding(
         self, organization: Organization, user: User
     ) -> None:
         raise MethodNotImplemented()
 
-    def delete_invitation(
-        self, organization_id: str, invitation_id: str
-    ) -> bool:
+    def delete_invitation(self, organization_id: str, invitation_id: str) -> bool:
         raise MethodNotImplemented()
 
     def add_organization_user_role(

diff --git a/backend/adapter_processor/models.py b/backend/adapter_processor/models.py
@@ -98,6 +98,7 @@ class Meta:
             ),
         ]
 
+
     def create_adapter(self) -> None:
 
         encryption_secret: str = settings.ENCRYPTION_KEY
@@ -111,6 +112,26 @@ def create_adapter(self) -> None:
         print("test")
         self.save()
 
+    def get_adapter_meta_data(self) -> Any:
+        encryption_secret: str = settings.ENCRYPTION_KEY
+        f: Fernet = Fernet(encryption_secret.encode("utf-8"))
+
+        adapter_metadata = json.loads(
+            f.decrypt(bytes(self.adapter_metadata_b).decode("utf-8"))
+        )
+        return adapter_metadata
+
+    def get_context_window_size(self) -> int:
+
+        adapter_metadata = self.get_adapter_meta_data()
+        # Get the adapter_instance
+        adapter_class = Adapterkit().get_adapter_class_by_adapter_id(self.adapter_id)
+        adapter_instance = adapter_class(adapter_metadata)
+        if isinstance(adapter_instance, LLMAdapter):
+            return adapter_instance.get_context_window_size()
+        return 0
+
+
 
 class UserDefaultAdapter(BaseModel):
     user = models.OneToOneField(User, on_delete=models.CASCADE)