Skip to content

Commit

Permalink
Update API key creation and bump version to 0.6.16 (#1704)
Browse files Browse the repository at this point in the history
* Update API key creation with optional created_at field

* Bump version to 0.6.16 in pyproject.toml

* Update last_used_at field in ApiKeyBase model
  • Loading branch information
ogabrielluiz committed Apr 15, 2024
1 parent e2172f4 commit 4e4338f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "langflow"
version = "0.6.15"
version = "0.6.16"
description = "A Python package with a built-in web application"
authors = ["Logspace <contact@logspace.ai>"]
maintainers = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def create_api_key(session: Session, api_key_create: ApiKeyCreate, user_id: UUID
api_key=generated_api_key,
name=api_key_create.name,
user_id=user_id,
created_at=api_key_create.created_at or datetime.datetime.now(datetime.timezone.utc),
)

session.add(api_key)
Expand Down
11 changes: 9 additions & 2 deletions src/backend/langflow/services/database/models/api_key/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,20 @@
from uuid import UUID, uuid4

from pydantic import validator
from sqlmodel import Field, Relationship, SQLModel, Field, Column, func, DateTime
from sqlmodel import Column, DateTime, Field, Relationship, SQLModel, func

if TYPE_CHECKING:
from langflow.services.database.models.user import User


def utcnow():
return datetime.now()


class ApiKeyBase(SQLModel):
name: Optional[str] = Field(index=True, nullable=True, default=None)
created_at: datetime = Field(sa_column=Column(DateTime(timezone=True), server_default=func.now()))
last_used_at: Optional[datetime] = Field(sa_column=Column(DateTime(timezone=True)))
last_used_at: Optional[datetime] = Field(None, sa_column=Column(DateTime(timezone=True)))
total_uses: int = Field(default=0)
is_active: bool = Field(default=True)

Expand All @@ -32,6 +36,9 @@ class ApiKey(ApiKeyBase, table=True):
class ApiKeyCreate(ApiKeyBase):
api_key: Optional[str] = None
user_id: Optional[UUID] = None
created_at: Optional[datetime] = Field(
default_factory=utcnow, description="The date and time the API key was created"
)


class UnmaskedApiKeyRead(ApiKeyBase):
Expand Down

0 comments on commit 4e4338f

Please sign in to comment.