Skip to content

Commit c4104c7

Browse files
giancarloromeogiancarloromeo
committed
add typealias
1 parent 0abee29 commit c4104c7

File tree

13 files changed

+40
-40
lines changed

13 files changed

+40
-40
lines changed

‎packages/models-library/src/models_library/api_schemas_long_running_tasks/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
ProgressMessage: TypeAlias = str
1111

12-
ProgressPercent = Annotated[float, Field(ge=0.0, le=1.0)]
12+
ProgressPercent: TypeAlias = Annotated[float, Field(ge=0.0, le=1.0)]
1313

1414

1515
class TaskProgress(BaseModel):

‎packages/models-library/src/models_library/api_schemas_storage.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
ETag: TypeAlias = str
3939

4040

41-
S3BucketName = Annotated[str, StringConstraints(pattern=S3_BUCKET_NAME_RE)]
41+
S3BucketName: TypeAlias = Annotated[str, StringConstraints(pattern=S3_BUCKET_NAME_RE)]
4242

43-
DatCoreDatasetName = Annotated[str, StringConstraints(pattern=DATCORE_DATASET_NAME_RE)]
43+
DatCoreDatasetName: TypeAlias = Annotated[str, StringConstraints(pattern=DATCORE_DATASET_NAME_RE)]
4444

4545

4646
# /

‎packages/models-library/src/models_library/api_schemas_webserver/product.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from datetime import datetime
2-
from typing import Annotated
2+
from typing import Annotated, TypeAlias
33

44
from pydantic import ConfigDict, Field, HttpUrl, NonNegativeInt, PositiveInt
55

@@ -76,7 +76,7 @@ class GetProduct(OutputSchema):
7676
)
7777

7878

79-
ExtraCreditsUsdRangeInt = Annotated[int, Field(ge=0, lt=500)]
79+
ExtraCreditsUsdRangeInt: TypeAlias = Annotated[int, Field(ge=0, lt=500)]
8080

8181

8282
class GenerateInvitation(InputSchema):

‎packages/models-library/src/models_library/basic_types.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,44 +14,44 @@
1414
UUID_RE,
1515
)
1616

17-
NonNegativeDecimal = Annotated[Decimal, Field(ge=0)]
17+
NonNegativeDecimal: TypeAlias = Annotated[Decimal, Field(ge=0)]
1818

19-
PositiveDecimal = Annotated[Decimal, Field(gt=0)]
19+
PositiveDecimal: TypeAlias = Annotated[Decimal, Field(gt=0)]
2020

2121
# Used for amounts like credits or dollars
2222
# NOTE: upper limit to avoid https://github.com/ITISFoundation/appmotion-exchange/issues/2
2323
# NOTE: do not contraint in decimal places. Too strong validation error rather Decimal.quantize
2424
# before passing the value
25-
AmountDecimal = Annotated[Decimal, Field(gt=0, lt=1e6)]
25+
AmountDecimal: TypeAlias = Annotated[Decimal, Field(gt=0, lt=1e6)]
2626

2727
# port number range
28-
PortInt = Annotated[int, Field(gt=0, lt=65535)]
28+
PortInt: TypeAlias = Annotated[int, Field(gt=0, lt=65535)]
2929

3030
# e.g. 'v5'
31-
VersionTag = Annotated[str, StringConstraints(pattern=r"^v\d$")]
31+
VersionTag: TypeAlias = Annotated[str, StringConstraints(pattern=r"^v\d$")]
3232

33-
VersionStr = Annotated[str, StringConstraints(pattern=SIMPLE_VERSION_RE)]
33+
VersionStr: TypeAlias = Annotated[str, StringConstraints(pattern=SIMPLE_VERSION_RE)]
3434

3535
# e.g. '1.23.11' or '2.1.0-rc2' or not 0.1.0-alpha (see test_SEMANTIC_VERSION_RE_W_CAPTURE_GROUPS)
36-
SemanticVersionStr = Annotated[
36+
SemanticVersionStr: TypeAlias = Annotated[
3737
str, StringConstraints(pattern=SEMANTIC_VERSION_RE_W_CAPTURE_GROUPS)
3838
]
3939

4040
# checksums
4141
# sha1sum path/to/file
42-
SHA1Str = Annotated[str, StringConstraints(pattern=r"^[a-fA-F0-9]{40}$")]
42+
SHA1Str: TypeAlias = Annotated[str, StringConstraints(pattern=r"^[a-fA-F0-9]{40}$")]
4343

4444
# sha256sum path/to/file
45-
SHA256Str = Annotated[str, StringConstraints(pattern=r"^[a-fA-F0-9]{64}$")]
45+
SHA256Str: TypeAlias = Annotated[str, StringConstraints(pattern=r"^[a-fA-F0-9]{64}$")]
4646

4747
# md5sum path/to/file
48-
MD5Str = Annotated[str, StringConstraints(pattern=r"^[a-fA-F0-9]{32}$")]
48+
MD5Str: TypeAlias = Annotated[str, StringConstraints(pattern=r"^[a-fA-F0-9]{32}$")]
4949

5050
# env var
51-
EnvVarKey = Annotated[str, StringConstraints(pattern=r"^[a-zA-Z]\w*")]
51+
EnvVarKey: TypeAlias = Annotated[str, StringConstraints(pattern=r"^[a-zA-Z]\w*")]
5252

5353
# e.g. '5c833a78-1af3-43a7-9ed7-6a63b188f4d8'
54-
UUIDStr = Annotated[str, StringConstraints(pattern=UUID_RE)]
54+
UUIDStr: TypeAlias = Annotated[str, StringConstraints(pattern=UUID_RE)]
5555

5656

5757
# non-empty bounded string used as identifier

‎packages/models-library/src/models_library/docker.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import contextlib
22
import re
3-
from typing import Annotated, Any, Final
3+
from typing import Annotated, Any, Final, TypeAlias
44

55
from pydantic import (
66
BaseModel,
@@ -33,7 +33,7 @@ def from_key(cls, key: str) -> "DockerLabelKey":
3333

3434

3535
# NOTE: https://docs.docker.com/engine/reference/commandline/tag/#description
36-
DockerGenericTag = Annotated[str, StringConstraints(pattern=DOCKER_GENERIC_TAG_KEY_RE)]
36+
DockerGenericTag: TypeAlias = Annotated[str, StringConstraints(pattern=DOCKER_GENERIC_TAG_KEY_RE)]
3737

3838

3939
class DockerPlacementConstraint(ConstrainedStr):

‎packages/models-library/src/models_library/emails.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from typing import Annotated
1+
from typing import Annotated, TypeAlias
22

33
from pydantic import AfterValidator, EmailStr
44

5-
LowerCaseEmailStr = Annotated[str, EmailStr, AfterValidator(str.lower)]
5+
LowerCaseEmailStr: TypeAlias = Annotated[str, EmailStr, AfterValidator(str.lower)]

‎packages/models-library/src/models_library/projects_networks.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import re
2-
from typing import Annotated, Final
2+
from typing import Annotated, Final, TypeAlias
33

44
from pydantic import BaseModel, ConfigDict, Field, StringConstraints
55

@@ -12,9 +12,9 @@
1212
PROJECT_NETWORK_PREFIX: Final[str] = "prj-ntwrk"
1313

1414

15-
DockerNetworkName = Annotated[str, StringConstraints(pattern=SERVICE_NETWORK_RE)]
15+
DockerNetworkName: TypeAlias = Annotated[str, StringConstraints(pattern=SERVICE_NETWORK_RE)]
1616

17-
DockerNetworkAlias = Annotated[str, StringConstraints(pattern=SERVICE_NETWORK_RE)]
17+
DockerNetworkAlias: TypeAlias = Annotated[str, StringConstraints(pattern=SERVICE_NETWORK_RE)]
1818

1919

2020
class ContainerAliases(DictModel[NodeIDStr, DockerNetworkAlias]):

‎packages/models-library/src/models_library/projects_nodes.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
OutputID, Annotated[OutputTypes, Field(union_mode="left_to_right")]
6767
]
6868

69-
UnitStr = Annotated[str, StringConstraints(strip_whitespace=True)]
69+
UnitStr: TypeAlias = Annotated[str, StringConstraints(strip_whitespace=True)]
7070

7171

7272
class NodeState(BaseModel):

‎packages/models-library/src/models_library/projects_nodes_io.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
NodeID = UUID
3333

34-
UUIDStr = Annotated[str, StringConstraints(pattern=UUID_RE)]
34+
UUIDStr: TypeAlias = Annotated[str, StringConstraints(pattern=UUID_RE)]
3535

3636
NodeIDStr = UUIDStr
3737

‎packages/models-library/src/models_library/rest_pagination.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Annotated, Final, Generic, TypeVar
1+
from typing import Annotated, Final, Generic, TypeAlias, TypeVar
22

33
from pydantic import (
44
BaseModel,
@@ -20,7 +20,7 @@
2020
MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE: Final[int] = 50
2121

2222

23-
PageLimitInt = Annotated[int, Field(ge=1, lt=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE)]
23+
PageLimitInt: TypeAlias = Annotated[int, Field(ge=1, lt=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE)]
2424

2525
DEFAULT_NUMBER_OF_ITEMS_PER_PAGE: Final[PageLimitInt] = TypeAdapter(
2626
PageLimitInt

0 commit comments

Comments
 (0)