Skip to content

Commit

Permalink
refactor: part 2 of splitting templates
Browse files Browse the repository at this point in the history
  • Loading branch information
doctrino committed Aug 16, 2024
1 parent f6b0def commit 8e4e491
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 41 deletions.
8 changes: 2 additions & 6 deletions cognite/pygen/_core/templates/data_classes_core_base.py.jinja
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
from __future__ import annotations

import datetime
import math
import sys
import warnings

from abc import ABC, abstractmethod
from collections import UserList
from collections import defaultdict
from collections.abc import Collection, Mapping
from collections.abc import MutableSequence, Iterable
from dataclasses import dataclass, field
from typing import (
Annotated,
Expand All @@ -24,11 +20,9 @@ from typing import (
overload,
Union,
SupportsIndex,
Literal,
)

import pandas as pd
from cognite.client import CogniteClient
from cognite.client import data_modeling as dm{% if is_pydantic_v2 %}
from cognite.client.data_classes import TimeSeries as CogniteTimeSeries{% endif %}
from cognite.client.data_classes import TimeSeriesList, Datapoints
Expand All @@ -42,6 +36,8 @@ from cognite.client.utils import datetime_to_ms
from pydantic import BaseModel{% if is_pydantic_v2 %}, BeforeValidator{% else %}, Extra{% endif %}, Field{% if is_pydantic_v2 %}, model_validator{% else %}, root_validator{% endif %}{% if is_pydantic_v2 %}
from pydantic.functional_serializers import PlainSerializer{% endif %}

from .constants import DEFAULT_INSTANCE_SPACE

if sys.version_info >= (3, 11):
from typing import Self
else:
Expand Down
46 changes: 20 additions & 26 deletions cognite/pygen/_core/templates/data_classes_core_query.py.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,14 @@ from __future__ import annotations

import datetime
import math
import sys
import warnings

from abc import ABC, abstractmethod
from collections import UserList
from collections import defaultdict
from collections.abc import Collection, Mapping
from collections.abc import Collection
from collections.abc import MutableSequence, Iterable
from dataclasses import dataclass, field
from typing import (
Annotated,
Callable,
cast,
ClassVar,
Generic,
Optional,
Any,
Iterator,
TypeVar,
Expand All @@ -27,25 +19,27 @@ from typing import (
Literal,
)

import pandas as pd
from cognite.client import CogniteClient
from cognite.client import data_modeling as dm{% if is_pydantic_v2 %}
from cognite.client.data_classes import TimeSeries as CogniteTimeSeries{% endif %}
from cognite.client.data_classes import TimeSeriesList, Datapoints
from cognite.client.data_classes.data_modeling.instances import (
Instance,
InstanceApply,
Properties,
PropertyValue,
from cognite.client import data_modeling as dm
from cognite.client.data_classes.data_modeling.instances import Instance

from .base import (
DomainModelList,
T_DomainList,
DomainRelationList,
DomainModelCore,
T_DomainModelList,
DomainRelation,
DomainModel,
)
from .constants import (
_NotSetSentinel,
DEFAULT_QUERY_LIMIT,
DEFAULT_INSTANCE_SPACE,
ACTUAL_INSTANCE_QUERY_LIMIT,
INSTANCE_QUERY_LIMIT,
)
from cognite.client.utils import datetime_to_ms
from pydantic import BaseModel{% if is_pydantic_v2 %}, BeforeValidator{% else %}, Extra{% endif %}, Field{% if is_pydantic_v2 %}, model_validator{% else %}, root_validator{% endif %}{% if is_pydantic_v2 %}
from pydantic.functional_serializers import PlainSerializer{% endif %}

if sys.version_info >= (3, 11):
from typing import Self
else:
from typing_extensions import Self
from .helpers import as_node_id


T_DomainListEnd = TypeVar("T_DomainListEnd", bound=Union[DomainModelList, DomainRelationList], covariant=True)
Expand Down
7 changes: 1 addition & 6 deletions examples/omni/data_classes/_core/base.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
from __future__ import annotations

import datetime
import math
import sys
import warnings

from abc import ABC, abstractmethod
from collections import UserList
from collections import defaultdict
from collections.abc import Collection, Mapping
from collections.abc import MutableSequence, Iterable
from dataclasses import dataclass, field
from typing import (
Annotated,
Expand All @@ -24,11 +20,9 @@
overload,
Union,
SupportsIndex,
Literal,
)

import pandas as pd
from cognite.client import CogniteClient
from cognite.client import data_modeling as dm
from cognite.client.data_classes import TimeSeries as CogniteTimeSeries
from cognite.client.data_classes import TimeSeriesList, Datapoints
Expand All @@ -41,6 +35,7 @@
from cognite.client.utils import datetime_to_ms
from pydantic import BaseModel, BeforeValidator, Field, model_validator
from pydantic.functional_serializers import PlainSerializer

from .constants import DEFAULT_INSTANCE_SPACE

if sys.version_info >= (3, 11):
Expand Down
4 changes: 1 addition & 3 deletions examples/omni/data_classes/_core/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@

from cognite.client import CogniteClient
from cognite.client import data_modeling as dm
from cognite.client.data_classes.data_modeling.instances import (
Instance,
)
from cognite.client.data_classes.data_modeling.instances import Instance

from .base import (
DomainModelList,
Expand Down

0 comments on commit 8e4e491

Please sign in to comment.