Update column types and bump version (#1653)

* Add logger import in script.py.mako

* Fix error handling during upgrade in alembic scripts

* Bump version to 0.6.14 in pyproject.toml

* Update column types in credential and api_key models

* Bump version to 0.6.15 in pyproject.toml
This commit is contained in:
Gabriel Luiz Freitas Almeida 2024-04-09 13:57:43 -03:00 • committed by GitHub
commit e2172f4b9c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 8 deletions

View file

@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "langflow" name = "langflow"
version = "0.6.14" version = "0.6.15"
description = "A Python package with a built-in web application" description = "A Python package with a built-in web application"
authors = ["Logspace <contact@logspace.ai>"] authors = ["Logspace <contact@logspace.ai>"]
maintainers = [ maintainers = [

View file

@ -36,7 +36,7 @@ def upgrade() -> None:
), ),
sa.Column("user_id", sqlmodel.sql.sqltypes.GUID(), nullable=False), sa.Column("user_id", sqlmodel.sql.sqltypes.GUID(), nullable=False),
sa.Column("id", sqlmodel.sql.sqltypes.GUID(), nullable=False), sa.Column("id", sqlmodel.sql.sqltypes.GUID(), nullable=False),
sa.Column("created_at", sa.DateTime(), nullable=False), sa.Column("created_at", sqlmodel.sql.sqltypes.DateTime(), nullable=False),
sa.Column("updated_at", sa.DateTime(), nullable=True), sa.Column("updated_at", sa.DateTime(), nullable=True),
sa.PrimaryKeyConstraint("id"), sa.PrimaryKeyConstraint("id"),
) )

View file

@ -3,7 +3,7 @@ from typing import TYPE_CHECKING, Optional
from uuid import UUID, uuid4 from uuid import UUID, uuid4
from pydantic import validator from pydantic import validator
from sqlmodel import Field, Relationship, SQLModel from sqlmodel import Field, Relationship, SQLModel, Field, Column, func, DateTime
if TYPE_CHECKING: if TYPE_CHECKING:
from langflow.services.database.models.user import User from langflow.services.database.models.user import User
@ -11,8 +11,8 @@ if TYPE_CHECKING:
class ApiKeyBase(SQLModel): class ApiKeyBase(SQLModel):
name: Optional[str] = Field(index=True, nullable=True, default=None) name: Optional[str] = Field(index=True, nullable=True, default=None)
created_at: datetime = Field(default_factory=datetime.utcnow) created_at: datetime = Field(sa_column=Column(DateTime(timezone=True), server_default=func.now()))
last_used_at: Optional[datetime] = Field(default=None, nullable=True) last_used_at: Optional[datetime] = Field(sa_column=Column(DateTime(timezone=True)))
total_uses: int = Field(default=0) total_uses: int = Field(default=0)
is_active: bool = Field(default=True) is_active: bool = Field(default=True)

View file

@ -2,7 +2,7 @@ from datetime import datetime
from typing import TYPE_CHECKING, Optional from typing import TYPE_CHECKING, Optional
from uuid import UUID, uuid4 from uuid import UUID, uuid4
from sqlmodel import Field, Relationship, SQLModel from sqlmodel import Field, Relationship, SQLModel, Column, func, DateTime
from langflow.services.database.models.credential.schema import CredentialType from langflow.services.database.models.credential.schema import CredentialType
@ -19,8 +19,11 @@ class CredentialBase(SQLModel):
class Credential(CredentialBase, table=True): class Credential(CredentialBase, table=True):
id: Optional[UUID] = Field(default_factory=uuid4, primary_key=True, description="Unique ID for the credential") id: Optional[UUID] = Field(default_factory=uuid4, primary_key=True, description="Unique ID for the credential")
# name is unique per user # name is unique per user
created_at: datetime = Field(default_factory=datetime.utcnow, description="Creation time of the credential") created_at: datetime = Field(
updated_at: Optional[datetime] = Field(None, description="Last update time of the credential") sa_column=Column(DateTime(timezone=True), server_default=func.now()),
description="Creation time of the credential",
)
updated_at: Optional[datetime] = Field(None,sa_column=Column(DateTime(timezone=True)), description="Last update time of the credential")
# foreign key to user table # foreign key to user table
user_id: UUID = Field(description="User ID associated with this credential", foreign_key="user.id") user_id: UUID = Field(description="User ID associated with this credential", foreign_key="user.id")
user: "User" = Relationship(back_populates="credentials") user: "User" = Relationship(back_populates="credentials")