8000 Python Language Generation by ryanpeach · Pull Request #808 · supabase/postgres-meta · GitHub
[go: up one dir, main page]
Skip to content

Python Language Generation #808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Python Language Generation #808

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd931c8
Added the test first for python
ryanpeach Oct 1, 2024
4e7a2fd
First stab at modifying go.ts into python.ts
ryanpeach Oct 1, 2024
77672e6
npm run format
ryanpeach Oct 1, 2024
a900dfd
Getting really close with our output
ryanpeach Oct 3, 2024
661e881
Now using the more modern Annotated format
ryanpeach Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Now using the more modern Annotated format
  • Loading branch information
@ryanpeach
ryanpeach committed Oct 3, 2024
commit 661e881e5ba7b7a88d8ce90250139f4b402db5ee
4 changes: 2 additions & 2 deletions src/server/templates/python.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const apply = ({

let output = `
from pydantic import BaseModel, Json
from typing import Any
from typing import Any, Annotated
import datetime

${tables
Expand Down Expand Up @@ -163,7 +163,7 @@ function generateTableStruct(
// Pad the formatted name and type to align the struct fields, then join
// create the final string representation of the struct fields.
const formattedColumnEntries = columnEntries.map(([formattedName, type, name]) => {
return ` ${formattedName}: ${type} = Field(alias="${name}")`
return ` ${formattedName}: Annotated[${type}, Field(alias="${name}")]`
})

return `
Expand Down
166 changes: 83 additions & 83 deletions test/server/typegen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2501,7 +2501,7 @@ test('typegen: python', async () => {
})
expect(body).toMatchInlineSnapshot(`
"from pydantic import BaseModel, Json
from typing import Any
from typing import Any, Annotated

import datetime

Expand All @@ -2510,75 +2510,75 @@ class UserStatus(Enum):
class MemeStatus(Enum):

class PublicUsersSelect(BaseModel):
id: int = Field(alias="id")
name: str | None = Field(alias="name")
status: UserStatus | None = Field(alias="status")
id: Annotated[int, Field(alias="id")]
name: Annotated[str | None, Field(alias="name")]
status: Annotated[UserStatus | None, Field(alias="status")]


class PublicUsersInsert(BaseModel):
id: int | None = Field(alias="id")
name: str | None = Field(alias="name")
status: UserStatus | None = Field(alias="status")
id: Annotated[int | None, Field(alias="id")]
name: Annotated[str | None, Field(alias="name")]
status: Annotated[UserStatus | None, Field(alias="status")]


class PublicUsersUpdate(BaseModel):
id: int | None = Field(alias="id")
name: str | None = Field(alias="name")
status: UserStatus | None = Field(alias="status")
id: Annotated[int | None, Field(alias="id")]
name: Annotated[str | None, Field(alias="name")]
status: Annotated[UserStatus | None, Field(alias="status")]


class PublicTodosSelect(BaseModel):
details: str | None = Field(alias="details")
id: int = Field(alias="id")
user_id: int = Field(alias="user-id")
details: Annotated[str | None, Field(alias="details")]
id: Annotated[int, Field(alias="id")]
user_id: Annotated[int, Field(alias="user-id")]


class PublicTodosInsert(BaseModel):
details: str | None = Field(alias="details")
id: int | None = Field(alias="id")
user_id: int = Field(alias="user-id")
details: Annotated[str | None, Field(alias="details")]
id: Annotated[int | None, Field(alias="id")]
user_id: Annotated[int, Field(alias="user-id")]


class PublicTodosUpdate(BaseModel):
details: str | None = Field(alias="details")
id: int | None = Field(alias="id")
user_id: int | None = Field(alias="user-id")
details: Annotated[str | None, Field(alias="details")]
id: Annotated[int | None, Field(alias="id")]
user_id: Annotated[int | None, Field(alias="user-id")]


class PublicUsersAuditSelect(BaseModel):
created_at: datetime.datetime | None = Field(alias="created_at")
id: int = Field(alias="id")
previous_value: Json[Any] | None = Field(alias="previous_value")
user_id: int | None = Field(alias="user_id")
created_at: Annotated[datetime.datetime | None, Field(alias="created_at")]
id: Annotated[int, Field(alias="id")]
previous_value: Annotated[Json[Any] | None, Field(alias="previous_value")]
user_id: Annotated[int | None, Field(alias="user_id")]


class PublicUsersAuditInsert(BaseModel):
created_at: datetime.datetime | None = Field(alias="created_at")
id: int | None = Field(alias="id")
previous_value: Json[Any] | None = Field(alias="previous_value")
user_id: int | None = Field(alias="user_id")
created_at: Annotated[datetime.datetime | None, Field(alias="created_at")]
id: Annotated[int | None, Field(alias="id")]
previous_value: Annotated[Json[Any] | None, Field(alias="previous_value")]
user_id: Annotated[int | None, Field(alias="user_id")]


class PublicUsersAuditUpdate(BaseModel):
created_at: datetime.datetime | None = Field(alias="created_at")
id: int | None = Field(alias="id")
previous_value: Json[Any] | None = Field(alias="previous_value")
user_id: int | None = Field(alias="user_id")
created_at: Annotated[datetime.datetime | None, Field(alias="created_at")]
id: Annotated[int | None, Field(alias="id")]
previous_value: Annotated[Json[Any] | None, Field(alias="previous_value")]
user_id: Annotated[int | None, Field(alias="user_id")]


class PublicUserDetailsSelect(BaseModel):
details: str | None = Field(alias="details")
user_id: int = Field(alias="user_id")
details: Annotated[str | None, Field(alias="details")]
user_id: Annotated[int, Field(alias="user_id")]


class PublicUserDetailsInsert(BaseModel):
details: str | None = Field(alias="details")
user_id: int = Field(alias="user_id")
details: Annotated[str | None, Field(alias="details")]
user_id: Annotated[int, Field(alias="user_id")]


class PublicUserDetailsUpdate(BaseModel):
details: str | None = Field(alias="details")
user_id: int | None = Field(alias="user_id")
details: Annotated[str | None, Field(alias="details")]
user_id: Annotated[int | None, Field(alias="user_id")]


class PublicEmptySelect(BaseModel):
Expand All @@ -2594,96 +2594,96 @@ class PublicEmptyUpdate(BaseModel):


class PublicTableWithOtherTablesRowTypeSelect(BaseModel):
col1: PublicUserDetailsSelect = Field(alias="col1")
col2: PublicAViewSelect = Field(alias="col2")
col1: Annotated[PublicUserDetailsSelect, Field(alias="col1")]
col2: Annotated[PublicAViewSelect, Field(alias="col2")]


class PublicTableWithOtherTablesRowTypeInsert(BaseModel):
col1: PublicUserDetailsSelect = Field(alias="col1")
col2: PublicAViewSelect = Field(alias="col2")
col1: Annotated[PublicUserDetailsSelect, Field(alias="col1")]
col2: Annotated[PublicAViewSelect, Field(alias="col2")]


class PublicTableWithOtherTablesRowTypeUpdate(BaseModel):
col1: PublicUserDetailsSelect = Field(alias="col1")
col2: PublicAViewSelect = Field(alias="col2")
col1: Annotated[PublicUserDetailsSelect, Field(alias="col1")]
col2: Annotated[PublicAViewSelect, Field(alias="col2")]


class PublicTableWithPrimaryKeyOtherThanIdSelect(BaseModel):
name: str | None = Field(alias="name")
other_id: int = Field(alias="other_id")
name: Annotated[str | None, Field(alias="name")]
other_id: Annotated[int, Field(alias="other_id")]


class PublicTableWithPrimaryKeyOtherThanIdInsert(BaseModel):
name: str | None = Field(alias="name")
other_id: int | None = Field(alias="other_id")
name: Annotated[str | None, Field(alias="name")]
other_id: Annotated[int | None, Field(alias="other_id")]


class PublicTableWithPrimaryKeyOtherThanIdUpdate(BaseModel):
name: str | None = Field(alias="name")
other_id: int | None = Field(alias="other_id")
name: Annotated[str | None, Field(alias="name")]
other_id: Annotated[int | None, Field(alias="other_id")]


class PublicCategorySelect(BaseModel):
id: int = Field(alias="id")
name: str = Field(alias="name")
id: Annotated[int, Field(alias="id")]
name: Annotated[str, Field(alias="name")]


class PublicCategoryInsert(BaseModel):
id: int | None = Field(alias="id")
name: str = Field(alias="name")
id: Annotated[int | None, Field(alias="id")]
name: Annotated[str, Field(alias="name")]


class PublicCategoryUpdate(BaseModel):
id: int | None = Field(alias="id")
name: str | None = Field(alias="name")
id: Annotated[int | None, Field(alias="id")]
name: Annotated[str | None, Field(alias="name")]


class PublicMemesSelect(BaseModel):
category: int | None = Field(alias="category")
created_at: datetime.datetime = Field(alias="created_at")
id: int = Field(alias="id")
metadata: Json[Any] | None = Field(alias="metadata")
name: str = Field(alias="name")
status: MemeStatus | None = Field(alias="status")
category: Annotated[int | None, Field(alias="category")]
created_at: Annotated[datetime.datetime, Field(alias="created_at")]
id: Annotated[int, Field(alias="id")]
metadata: Annotated[Json[Any] | None, Field(alias="metadata")]
name: Annotated[str, Field(alias="name")]
status: Annotated[MemeStatus | None, Field(alias="status")]


class PublicMemesInsert(BaseModel):
category: int | None = Field(alias="category")
created_at: datetime.datetime = Field(alias="created_at")
id: int | None = Field(alias="id")
metadata: Json[Any] | None = Field(alias="metadata")
name: str = Field(alias="name")
status: MemeStatus | None = Field(alias="status")
category: Annotated[int | None, Field(alias="category")]
created_at: Annotated[datetime.datetime, Field(alias="created_at")]
id: Annotated[int | None, Field(alias="id")]
metadata: Annotated[Json[Any] | None, Field(alias="metadata")]
name: Annotated[str, Field(alias="name")]
status: Annotated[MemeStatus | None, Field(alias="status")]


class PublicMemesUpdate(BaseModel):
category: int | None = Field(alias="category")
created_at: datetime.datetime | None = Field(alias="created_at")
id: int | None = Field(alias="id")
metadata: Json[Any] | None = Field(alias="metadata")
name: str | None = Field(alias="name")
status: MemeStatus | None = Field(alias="status")
category: Annotated[int | None, Field(alias="category")]
created_at: Annotated[datetime.datetime | None, Field(alias="created_at")]
id: Annotated[int | None, Field(alias="id")]
metadata: Annotated[Json[Any] | None, Field(alias="metadata")]
name: Annotated[str | None, Field(alias="name")]
status: Annotated[MemeStatus | None, Field(alias="status")]


class PublicTodosViewSelect(BaseModel):
details: str | None = Field(alias="details")
id: int | None = Field(alias="id")
user_id: int | None = Field(alias="user-id")
details: Annotated[str | None, Field(alias="details")]
id: Annotated[int | None, Field(alias="id")]
user_id: Annotated[int | None, Field(alias="user-id")]


class PublicUsersViewSelect(BaseModel):
id: int | None = Field(alias="id")
name: str | None = Field(alias="name")
status: UserStatus | None = Field(alias="status")
id: Annotated[int | None, Field(alias="id")]
name: Annotated[str | None, Field(alias="name")]
status: Annotated[UserStatus | None, Field(alias="status")]


class PublicAViewSelect(BaseModel):
id: int | None = Field(alias="id")
id: Annotated[int | None, Field(alias="id")]


class PublicTodosMatviewSelect(BaseModel):
details: str | None = Field(alias="details")
id: int | None = Field(alias="id")
user_id: int | None = Field(alias="user-id")
details: Annotated[str | None, Field(alias="details")]
id: Annotated[int | None, Field(alias="id")]
user_id: Annotated[int | None, Field(alias="user-id")]
"`)
})
0