Refactor code and fix imports
This commit is contained in:
parent
155e441406
commit
f109a4097e
4 changed files with 12 additions and 10 deletions
|
|
@ -5,13 +5,14 @@ from uuid import UUID
|
||||||
import orjson
|
import orjson
|
||||||
from fastapi import APIRouter, Depends, File, HTTPException, UploadFile
|
from fastapi import APIRouter, Depends, File, HTTPException, UploadFile
|
||||||
from fastapi.encoders import jsonable_encoder
|
from fastapi.encoders import jsonable_encoder
|
||||||
|
from sqlmodel import Session, select
|
||||||
|
|
||||||
from langflow.api.utils import remove_api_keys, validate_is_component
|
from langflow.api.utils import remove_api_keys, validate_is_component
|
||||||
from langflow.api.v1.schemas import FlowListCreate, FlowListRead
|
from langflow.api.v1.schemas import FlowListCreate, FlowListRead
|
||||||
from langflow.services.auth.utils import get_current_active_user
|
from langflow.services.auth.utils import get_current_active_user
|
||||||
from langflow.services.database.models.flow import Flow, FlowCreate, FlowRead, FlowUpdate
|
from langflow.services.database.models.flow import Flow, FlowCreate, FlowRead, FlowUpdate
|
||||||
from langflow.services.database.models.user.model import User
|
from langflow.services.database.models.user.model import User
|
||||||
from langflow.services.deps import get_session, get_settings_service
|
from langflow.services.deps import get_session, get_settings_service
|
||||||
from sqlmodel import Session, select
|
|
||||||
|
|
||||||
# build router
|
# build router
|
||||||
router = APIRouter(prefix="/flows", tags=["Flows"])
|
router = APIRouter(prefix="/flows", tags=["Flows"])
|
||||||
|
|
@ -122,7 +123,7 @@ def create_flows(
|
||||||
db_flows = []
|
db_flows = []
|
||||||
for flow in flow_list.flows:
|
for flow in flow_list.flows:
|
||||||
flow.user_id = current_user.id
|
flow.user_id = current_user.id
|
||||||
db_flow = Flow.from_orm(flow)
|
db_flow = Flow.model_validate(flow, from_attributes=True)
|
||||||
session.add(db_flow)
|
session.add(db_flow)
|
||||||
db_flows.append(db_flow)
|
db_flows.append(db_flow)
|
||||||
session.commit()
|
session.commit()
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,11 @@
|
||||||
from uuid import UUID
|
from uuid import UUID
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException
|
from fastapi import APIRouter, Depends, HTTPException
|
||||||
|
from sqlalchemy import func
|
||||||
|
from sqlalchemy.exc import IntegrityError
|
||||||
|
from sqlmodel import Session, select
|
||||||
|
from sqlmodel.sql.expression import SelectOfScalar
|
||||||
|
|
||||||
from langflow.api.v1.schemas import UsersResponse
|
from langflow.api.v1.schemas import UsersResponse
|
||||||
from langflow.services.auth.utils import (
|
from langflow.services.auth.utils import (
|
||||||
get_current_active_superuser,
|
get_current_active_superuser,
|
||||||
|
|
@ -11,10 +16,6 @@ from langflow.services.auth.utils import (
|
||||||
from langflow.services.database.models.user import User, UserCreate, UserRead, UserUpdate
|
from langflow.services.database.models.user import User, UserCreate, UserRead, UserUpdate
|
||||||
from langflow.services.database.models.user.crud import get_user_by_id, update_user
|
from langflow.services.database.models.user.crud import get_user_by_id, update_user
|
||||||
from langflow.services.deps import get_session, get_settings_service
|
from langflow.services.deps import get_session, get_settings_service
|
||||||
from sqlalchemy import func
|
|
||||||
from sqlalchemy.exc import IntegrityError
|
|
||||||
from sqlmodel import Session, select
|
|
||||||
from sqlmodel.sql.expression import SelectOfScalar
|
|
||||||
|
|
||||||
router = APIRouter(tags=["Users"], prefix="/users")
|
router = APIRouter(tags=["Users"], prefix="/users")
|
||||||
|
|
||||||
|
|
@ -28,7 +29,7 @@ def add_user(
|
||||||
"""
|
"""
|
||||||
Add a new user to the database.
|
Add a new user to the database.
|
||||||
"""
|
"""
|
||||||
new_user = User.from_orm(user)
|
new_user = User.model_validate(user, from_attributes=True)
|
||||||
try:
|
try:
|
||||||
new_user.password = get_password_hash(user.password)
|
new_user.password = get_password_hash(user.password)
|
||||||
new_user.is_active = settings_service.auth_settings.NEW_USER_IS_ACTIVE
|
new_user.is_active = settings_service.auth_settings.NEW_USER_IS_ACTIVE
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
from typing import Optional, Union
|
from typing import List, Optional, Union
|
||||||
|
|
||||||
import chromadb # type: ignore
|
import chromadb # type: ignore
|
||||||
from langchain.embeddings.base import Embeddings
|
from langchain.embeddings.base import Embeddings
|
||||||
|
|
@ -56,7 +56,7 @@ class ChromaComponent(CustomComponent):
|
||||||
embedding: Embeddings,
|
embedding: Embeddings,
|
||||||
chroma_server_ssl_enabled: bool,
|
chroma_server_ssl_enabled: bool,
|
||||||
persist_directory: Optional[str] = None,
|
persist_directory: Optional[str] = None,
|
||||||
documents: Optional[Document] = None,
|
documents: Optional[List[Document]] = None,
|
||||||
chroma_server_cors_allow_origins: Optional[str] = None,
|
chroma_server_cors_allow_origins: Optional[str] = None,
|
||||||
chroma_server_host: Optional[str] = None,
|
chroma_server_host: Optional[str] = None,
|
||||||
chroma_server_port: Optional[int] = None,
|
chroma_server_port: Optional[int] = None,
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ def create_api_key(session: Session, api_key_create: ApiKeyCreate, user_id: UUID
|
||||||
session.add(api_key)
|
session.add(api_key)
|
||||||
session.commit()
|
session.commit()
|
||||||
session.refresh(api_key)
|
session.refresh(api_key)
|
||||||
unmasked = UnmaskedApiKeyRead.from_orm(api_key)
|
unmasked = UnmaskedApiKeyRead.model_validate(api_key, from_attributes=True)
|
||||||
unmasked.api_key = generated_api_key
|
unmasked.api_key = generated_api_key
|
||||||
return unmasked
|
return unmasked
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue