From edd58705e4c4962c9d5cc200a99cd771827cb79e Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 25 Aug 2023 12:03:03 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20refactor(schemas.py):=20update?= =?UTF-8?q?=20import=20statement=20for=20ApiKeyRead=20to=20reflect=20new?= =?UTF-8?q?=20file=20structure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🔨 refactor(schemas.py): update import statement for ApiKeyRead to reflect --- src/backend/langflow/api/v1/schemas.py | 27 +++++++++++++++------ src/backend/langflow/api/v1/users.py | 2 +- src/backend/langflow/services/auth/utils.py | 2 +- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/backend/langflow/api/v1/schemas.py b/src/backend/langflow/api/v1/schemas.py index d788469fa..3c138610c 100644 --- a/src/backend/langflow/api/v1/schemas.py +++ b/src/backend/langflow/api/v1/schemas.py @@ -1,7 +1,8 @@ from enum import Enum from pathlib import Path from typing import Any, Dict, List, Optional, Union -from langflow.services.database.models.api_key import ApiKeyRead +from uuid import UUID +from langflow.services.database.models.api_key.api_key import ApiKeyRead from langflow.services.database.models.flow import FlowCreate, FlowRead from langflow.services.database.models.user import UserRead from pydantic import BaseModel, Field, validator @@ -138,12 +139,24 @@ class ComponentListRead(BaseModel): flows: List[FlowRead] -class ApiKeyResponse(BaseModel): - total_count: int - user_id: str - api_keys: List[ApiKeyRead] - - class UsersResponse(BaseModel): total_count: int users: List[UserRead] + + +class ApiKeyResponse(BaseModel): + id: str + api_key: str + name: str + created_at: str + last_used_at: str + + +class ApiKeysResponse(BaseModel): + total_count: int + user_id: UUID + api_keys: List[ApiKeyRead] + + +class CreateApiKeyRequest(BaseModel): + name: str diff --git a/src/backend/langflow/api/v1/users.py b/src/backend/langflow/api/v1/users.py index e41551e8c..140ee773f 100644 --- a/src/backend/langflow/api/v1/users.py +++ b/src/backend/langflow/api/v1/users.py @@ -19,7 +19,7 @@ from langflow.services.auth.utils import ( get_current_active_user, get_password_hash, ) -from langflow.services.database.models.user.utils import ( +from langflow.services.database.models.user.crud import ( update_user, ) diff --git a/src/backend/langflow/services/auth/utils.py b/src/backend/langflow/services/auth/utils.py index 540b012b1..8cc67d216 100644 --- a/src/backend/langflow/services/auth/utils.py +++ b/src/backend/langflow/services/auth/utils.py @@ -5,7 +5,7 @@ from typing import Annotated, Coroutine from uuid import UUID from langflow.services.auth.service import AuthManager from langflow.services.database.models.user.user import User -from langflow.services.database.models.user.utils import ( +from langflow.services.database.models.user.crud import ( get_user_by_id, get_user_by_username, update_user_last_login_at,