🔧 chore(alembic): make changes for the store
🔧 chore(api_key.py): remove unused imports and update save_store_api_key endpoint to use ApiKeyCreateRequest model 🔧 chore(schemas.py): add ApiKeyCreateRequest model 🔧 chore(store.py): remove unused imports and update imports in store.py
This commit is contained in:
parent
986f7202d2
commit
52900503de
4 changed files with 23 additions and 20 deletions
|
|
@ -13,29 +13,33 @@ import sqlmodel
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
# revision identifiers, used by Alembic.
|
||||||
revision: str = '595c9c2a2ad4'
|
revision: str = "595c9c2a2ad4"
|
||||||
down_revision: Union[str, None] = 'eb5866d51fd2'
|
down_revision: Union[str, None] = "eb5866d51fd2"
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
def upgrade() -> None:
|
||||||
# ### commands auto generated by Alembic - please adjust! ###
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
with op.batch_alter_table('flow', schema=None) as batch_op:
|
with op.batch_alter_table("flow", schema=None) as batch_op:
|
||||||
batch_op.add_column(sa.Column('is_component', sa.Boolean(), nullable=False))
|
batch_op.add_column(sa.Column("is_component", sa.Boolean(), nullable=False))
|
||||||
|
|
||||||
with op.batch_alter_table('user', schema=None) as batch_op:
|
with op.batch_alter_table("user", schema=None) as batch_op:
|
||||||
batch_op.add_column(sa.Column('store_api_key', sqlmodel.sql.sqltypes.AutoString(), nullable=True))
|
batch_op.add_column(
|
||||||
|
sa.Column(
|
||||||
|
"store_api_key", sqlmodel.sql.sqltypes.AutoString(), nullable=True
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
# ### end Alembic commands ###
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
def downgrade() -> None:
|
||||||
# ### commands auto generated by Alembic - please adjust! ###
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
with op.batch_alter_table('user', schema=None) as batch_op:
|
with op.batch_alter_table("user", schema=None) as batch_op:
|
||||||
batch_op.drop_column('store_api_key')
|
batch_op.drop_column("store_api_key")
|
||||||
|
|
||||||
with op.batch_alter_table('flow', schema=None) as batch_op:
|
with op.batch_alter_table("flow", schema=None) as batch_op:
|
||||||
batch_op.drop_column('is_component')
|
batch_op.drop_column("is_component")
|
||||||
|
|
||||||
# ### end Alembic commands ###
|
# ### end Alembic commands ###
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
from uuid import UUID
|
from uuid import UUID
|
||||||
from fastapi import APIRouter, HTTPException, Depends, Body
|
from fastapi import APIRouter, HTTPException, Depends
|
||||||
from langflow.api.v1.schemas import ApiKeysResponse
|
from langflow.api.v1.schemas import ApiKeysResponse, ApiKeyCreateRequest
|
||||||
from langflow.services.auth import utils as auth_utils
|
from langflow.services.auth import utils as auth_utils
|
||||||
from langflow.services.database.models.api_key.api_key import (
|
from langflow.services.database.models.api_key.api_key import (
|
||||||
ApiKeyCreate,
|
ApiKeyCreate,
|
||||||
|
|
@ -15,7 +15,6 @@ from langflow.services.database.models.api_key.crud import (
|
||||||
)
|
)
|
||||||
from langflow.services.database.models.user.user import User
|
from langflow.services.database.models.user.user import User
|
||||||
from langflow.services.deps import (
|
from langflow.services.deps import (
|
||||||
get_store_service,
|
|
||||||
get_session,
|
get_session,
|
||||||
get_settings_service,
|
get_settings_service,
|
||||||
)
|
)
|
||||||
|
|
@ -25,8 +24,7 @@ from typing import TYPE_CHECKING
|
||||||
from sqlmodel import Session
|
from sqlmodel import Session
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from langflow.services.store.service import StoreService
|
pass
|
||||||
from langflow.services.settings.service import SettingsService
|
|
||||||
|
|
||||||
router = APIRouter(tags=["APIKey"], prefix="/api_key")
|
router = APIRouter(tags=["APIKey"], prefix="/api_key")
|
||||||
|
|
||||||
|
|
@ -73,7 +71,7 @@ def delete_api_key_route(
|
||||||
|
|
||||||
@router.post("/store")
|
@router.post("/store")
|
||||||
def save_store_api_key(
|
def save_store_api_key(
|
||||||
api_key: Body(str, embed=True),
|
api_key: ApiKeyCreateRequest,
|
||||||
current_user: User = Depends(auth_utils.get_current_active_user),
|
current_user: User = Depends(auth_utils.get_current_active_user),
|
||||||
db: Session = Depends(get_session),
|
db: Session = Depends(get_session),
|
||||||
settings_service=Depends(get_settings_service),
|
settings_service=Depends(get_settings_service),
|
||||||
|
|
|
||||||
|
|
@ -198,3 +198,7 @@ class Token(BaseModel):
|
||||||
access_token: str
|
access_token: str
|
||||||
refresh_token: str
|
refresh_token: str
|
||||||
token_type: str
|
token_type: str
|
||||||
|
|
||||||
|
|
||||||
|
class ApiKeyCreateRequest(BaseModel):
|
||||||
|
api_key: str
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
from datetime import timezone
|
from typing import List, Optional
|
||||||
from typing import List, TYPE_CHECKING, Optional
|
|
||||||
from uuid import UUID
|
from uuid import UUID
|
||||||
from langflow.services.auth import utils as auth_utils
|
from langflow.services.auth import utils as auth_utils
|
||||||
from langflow.services.database.models.flow.flow import Flow
|
from langflow.services.database.models.flow.flow import Flow
|
||||||
|
|
@ -11,9 +10,7 @@ from langflow.services.deps import (
|
||||||
)
|
)
|
||||||
from langflow.services.store.schema import ComponentResponse
|
from langflow.services.store.schema import ComponentResponse
|
||||||
|
|
||||||
from sqlmodel import Session, select
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||||
from sqlalchemy.exc import IntegrityError
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from langflow.services.store.service import StoreService
|
from langflow.services.store.service import StoreService
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue