Skip to content

fix: remove extra forbid constraint #48

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

Merged
anandgupta42 merged 10 commits into from
Jan 21, 2025
Merged

fix: remove extra forbid constraint #48

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
831b509
fix: remove extra forbid constraint
suryaiyer95 Jan 21, 2025
38dad6d
fix: formatting black
suryaiyer95 Jan 21, 2025
43a5d84
fix: tests for multiple pydantic version and removing tests for (3.8 …
suryaiyer95 Jan 21, 2025
e409801
fix: tests
suryaiyer95 Jan 21, 2025
cde2195
fix: ignore warnings
suryaiyer95 Jan 21, 2025
f717673
fix: disable tests
suryaiyer95 Jan 21, 2025
72d22ce
fix: remove pyp38 tests
suryaiyer95 Jan 21, 2025
ffae1f8
fix: test envs
suryaiyer95 Jan 21, 2025
e598b5e
fix: ci
suryaiyer95 Jan 21, 2025
1514bf1
fix: actions
suryaiyer95 Jan 21, 2025
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
136 changes: 101 additions & 35 deletions .github/workflows/github-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,30 @@ jobs:
python_arch: 'x64'
tox_env: 'py39-cover'
os: 'macos-13'
- name: 'py39-pydantic28-cover (ubuntu)'
python: '3.9'
toxpython: 'python3.9'
python_arch: 'x64'
tox_env: 'py39-pydantic28-cover'
os: 'ubuntu-latest'
- name: 'py39-pydantic210-cover (ubuntu)'
python: '3.9'
toxpython: 'python3.9'
python_arch: 'x64'
tox_env: 'py39-pydantic210-cover'
os: 'ubuntu-latest'
- name: 'py39-nocov (ubuntu)'
python: '3.9'
toxpython: 'python3.9'
python_arch: 'x64'
tox_env: 'py39-nocov'
os: 'ubuntu-latest'
- name: 'py39-pydantic28-nocov (ubuntu)'
python: '3.9'
toxpython: 'python3.9'
python_arch: 'x64'
tox_env: 'py39-pydantic28-nocov'
os: 'ubuntu-latest'
- name: 'py39-nocov (windows)'
python: '3.9'
toxpython: 'python3.9'
Expand Down Expand Up @@ -109,12 +127,30 @@ jobs:
python_arch: 'x64'
tox_env: 'py310-cover'
os: 'macos-13'
- name: 'py310-pydantic28-cover (ubuntu)'
python: '3.10'
toxpython: 'python3.10'
python_arch: 'x64'
tox_env: 'py310-pydantic28-cover'
os: 'ubuntu-latest'
- name: 'py310-pydantic210-cover (ubuntu)'
python: '3.10'
toxpython: 'python3.10'
python_arch: 'x64'
tox_env: 'py310-pydantic210-cover'
os: 'ubuntu-latest'
- name: 'py310-nocov (ubuntu)'
python: '3.10'
toxpython: 'python3.10'
python_arch: 'x64'
tox_env: 'py310-nocov'
os: 'ubuntu-latest'
- name: 'py310-pydantic28-nocov (ubuntu)'
python: '3.10'
toxpython: 'python3.10'
python_arch: 'x64'
tox_env: 'py310-pydantic28-nocov'
os: 'ubuntu-latest'
- name: 'py310-nocov (windows)'
python: '3.10'
toxpython: 'python3.10'
Expand Down Expand Up @@ -151,6 +187,18 @@ jobs:
python_arch: 'x64'
tox_env: 'py311-nocov'
os: 'ubuntu-latest'
- name: 'py311-pydantic28-cover (ubuntu)'
python: '3.11'
toxpython: 'python3.11'
python_arch: 'x64'
tox_env: 'py311-pydantic28-cover'
os: 'ubuntu-latest'
- name: 'py311-pydantic210-cover (ubuntu)'
python: '3.11'
toxpython: 'python3.11'
python_arch: 'x64'
tox_env: 'py311-pydantic210-cover'
os: 'ubuntu-latest'
- name: 'py311-nocov (windows)'
python: '3.11'
toxpython: 'python3.11'
Expand Down Expand Up @@ -187,53 +235,35 @@ jobs:
python_arch: 'x64'
tox_env: 'py312-nocov'
os: 'ubuntu-latest'
- name: 'py312-nocov (windows)'
- name: 'py312-pydantic28-cover (ubuntu)'
python: '3.12'
toxpython: 'python3.12'
python_arch: 'x64'
tox_env: 'py312-nocov'
os: 'windows-latest'
- name: 'py312-nocov (macos)'
tox_env: 'py312-pydantic28-cover'
os: 'ubuntu-latest'
- name: 'py312-pydantic210-cover (ubuntu)'
python: '3.12'
toxpython: 'python3.12'
python_arch: 'x64'
tox_env: 'py312-nocov'
os: 'macos-13'
- name: 'pypy38-cover (ubuntu)'
python: 'pypy-3.8'
toxpython: 'pypy3.8'
python_arch: 'x64'
tox_env: 'pypy38-cover'
tox_env: 'py312-pydantic210-cover'
os: 'ubuntu-latest'
- name: 'pypy38-cover (windows)'
python: 'pypy-3.8'
toxpython: 'pypy3.8'
python_arch: 'x64'
tox_env: 'pypy38-cover'
os: 'windows-latest'
- name: 'pypy38-cover (macos)'
python: 'pypy-3.8'
toxpython: 'pypy3.8'
python_arch: 'x64'
tox_env: 'pypy38-cover'
os: 'macos-13'
- name: 'pypy38-nocov (ubuntu)'
python: 'pypy-3.8'
toxpython: 'pypy3.8'
- name: 'py312-pydantic28-nocov (ubuntu)'
python: '3.12'
toxpython: 'python3.12'
python_arch: 'x64'
tox_env: 'pypy38-nocov'
tox_env: 'py312-pydantic28-nocov'
os: 'ubuntu-latest'
- name: 'pypy38-nocov (windows)'
python: 'pypy-3.8'
toxpython: 'pypy3.8'
- name: 'py312-nocov (windows)'
python: '3.12'
toxpython: 'python3.12'
python_arch: 'x64'
tox_env: 'pypy38-nocov'
tox_env: 'py312-nocov'
os: 'windows-latest'
- name: 'pypy38-nocov (macos)'
python: 'pypy-3.8'
toxpython: 'pypy3.8'
- name: 'py312-nocov (macos)'
python: '3.12'
toxpython: 'python3.12'
python_arch: 'x64'
tox_env: 'pypy38-nocov'
tox_env: 'py312-nocov'
os: 'macos-13'
- name: 'pypy39-cover (ubuntu)'
python: 'pypy-3.9'
Expand All @@ -253,12 +283,30 @@ jobs:
python_arch: 'x64'
tox_env: 'pypy39-cover'
os: 'macos-13'
- name: 'pypy39-pydantic28-cover (ubuntu)'
python: 'pypy-3.9'
toxpython: 'pypy3.9'
python_arch: 'x64'
tox_env: 'pypy39-pydantic28-cover'
os: 'ubuntu-latest'
- name: 'pypy39-pydantic210-cover (ubuntu)'
python: 'pypy-3.9'
toxpython: 'pypy3.9'
python_arch: 'x64'
tox_env: 'pypy39-pydantic210-cover'
os: 'ubuntu-latest'
- name: 'pypy39-nocov (ubuntu)'
python: 'pypy-3.9'
toxpython: 'pypy3.9'
python_arch: 'x64'
tox_env: 'pypy39-nocov'
os: 'ubuntu-latest'
- name: 'pypy39-pydantic28-nocov (ubuntu)'
python: 'pypy-3.9'
toxpython: 'pypy3.9'
python_arch: 'x64'
tox_env: 'pypy39-pydantic28-nocov'
os: 'ubuntu-latest'
- name: 'pypy39-nocov (windows)'
python: 'pypy-3.9'
toxpython: 'pypy3.9'
Expand Down Expand Up @@ -289,12 +337,30 @@ jobs:
python_arch: 'x64'
tox_env: 'pypy310-cover'
os: 'macos-13'
- name: 'pypy310-pydantic28-cover (ubuntu)'
python: 'pypy-3.10'
toxpython: 'pypy3.10'
python_arch: 'x64'
tox_env: 'pypy310-pydantic28-cover'
os: 'ubuntu-latest'
- name: 'pypy310-pydantic210-cover (ubuntu)'
python: 'pypy-3.10'
toxpython: 'pypy3.10'
python_arch: 'x64'
tox_env: 'pypy310-pydantic210-cover'
os: 'ubuntu-latest'
- name: 'pypy310-nocov (ubuntu)'
python: 'pypy-3.10'
toxpython: 'pypy3.10'
python_arch: 'x64'
tox_env: 'pypy310-nocov'
os: 'ubuntu-latest'
- name: 'pypy310-pydantic28-nocov (ubuntu)'
python: 'pypy-3.10'
toxpython: 'pypy3.10'
python_arch: 'x64'
tox_env: 'pypy310-pydantic28-nocov'
os: 'ubuntu-latest'
- name: 'pypy310-nocov (windows)'
python: 'pypy-3.10'
toxpython: 'pypy3.10'
Expand Down
7 changes: 0 additions & 7 deletions src/datapilot/constants.py
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/datapilot/core/platforms/dbt/schemas/catalog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,10 @@
from typing import Optional
from typing import Union

from pydantic import ConfigDict
from pydantic.main import BaseModel

from datapilot.constants import Extra


class AltimateCatalogMetadata(BaseModel):
model_config = ConfigDict(
extra=Extra.forbid,
)

dbt_schema_version: Optional[str] = "https://schemas.getdbt.com/dbt/catalog/v1.json"
dbt_version: Optional[str] = "0.19.0"
generated_at: Optional[datetime] = "2021-02-10T04:42:33.680487Z"
Expand All @@ -24,10 +17,6 @@ class AltimateCatalogMetadata(BaseModel):


class AltimateCatalogTableMetadata(BaseModel):
model_config = ConfigDict(
extra=Extra.forbid,
)

type: str
database: Optional[Optional[str]] = None
schema_name: str
Expand All @@ -37,21 +26,13 @@ class AltimateCatalogTableMetadata(BaseModel):


class AltimateCatalogColumnMetadata(BaseModel):
model_config = ConfigDict(
extra=Extra.forbid,
)

type: str
comment: Optional[Optional[str]] = None
index: int
name: str


class AltimateCatalogStatsItem(BaseModel):
model_config = ConfigDict(
extra=Extra.forbid,
)

id: str
label: str
value: Optional[Optional[Union[bool, str, float]]] = None
Expand All @@ -60,21 +41,13 @@ class AltimateCatalogStatsItem(BaseModel):


class AltimateCatalogTable(BaseModel):
model_config = ConfigDict(
extra=Extra.forbid,
)

metadata: AltimateCatalogTableMetadata
columns: Dict[str, AltimateCatalogColumnMetadata]
stats: Dict[str, AltimateCatalogStatsItem]
unique_id: Optional[Optional[str]] = None


class AltimateCatalogCatalogV1(BaseModel):
model_config = ConfigDict(
extra=Extra.forbid,
)

metadata: AltimateCatalogMetadata
nodes: Dict[str, AltimateCatalogTable]
sources: Dict[str, AltimateCatalogTable]
Expand Down
Loading
Loading