Skip to content
This repository was archived by the owner on Apr 30, 2025. It is now read-only.

Commit 820caf8

Browse files
automatic-pr-create[bot]Jozefiel
automatic-pr-create[bot]
and
Jozefiel
authored
[resource-manager] Create and publish packages for 6.0.0 (#76)
Co-authored-by: Jozefiel <[email protected]>
1 parent 5fae20c commit 820caf8

File tree

3 files changed

+43
-29
lines changed

3 files changed

+43
-29
lines changed

‎resource-manager/python/RELEASE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
| Docker Image Tag | Python Library Version |
44
|------------------|------------------------|
55
| 1.0.10 | 0.0.1 |
6-
| 2.0.0 | 1.0.0, 1.1.0, 2.0.0 |
6+
| 2.0.0 | 1.0.0, 1.1.0, 2.0.0 |
7+
| 6.0.0 | 3.0.0 |

‎resource-manager/python/frinx_api/resource_manager/__init__.py

Lines changed: 40 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,25 @@
2222

2323

2424
class AllocationStrategyLang(ENUM):
25-
js = 'js'
26-
py = 'py'
25+
JS = 'js'
26+
PY = 'py'
27+
GO = 'go'
28+
29+
30+
class OrderDirection(ENUM):
31+
ASC = 'ASC'
32+
DESC = 'DESC'
2733

2834

2935
class PoolType(ENUM):
30-
allocating = 'allocating'
31-
set = 'set'
32-
singleton = 'singleton'
36+
ALLOCATING = 'allocating'
37+
SET = 'set'
38+
SINGLETON = 'singleton'
39+
40+
41+
class ResourcePoolOrderField(ENUM):
42+
NAME = 'name'
43+
DEALOCATIONSAFETYPERIOD = 'dealocationSafetyPeriod'
3344

3445

3546
class Node(Interface):
@@ -138,6 +149,11 @@ class ResourcePoolInput(Input):
138149
pool_properties: Map = Field(alias='poolProperties')
139150

140151

152+
class SortResourcePoolsInput(Input):
153+
direction: OrderDirection
154+
field: typing.Optional[ResourcePoolOrderField] = Field(default=None)
155+
156+
141157
class TagAnd(Input):
142158
matches_all: typing.Optional[list[String]] = Field(default=None, alias='matchesAll')
143159

@@ -627,26 +643,18 @@ class UpdateResourceAltIdData(BaseModel):
627643
update_resource_alt_id: ResourcePayload = Field(alias='UpdateResourceAltId')
628644

629645

630-
class OutputCursor(Payload):
631-
id: typing.Optional[Boolean] = Field(default=False, alias='ID')
632-
633-
634-
class OutputCursorPayload(BaseModel):
635-
id: typing.Optional[typing.Optional[String]] = Field(default=None, alias='ID')
636-
637-
638646
class PageInfo(Payload):
639-
end_cursor: typing.Optional[OutputCursor] = Field(default=None, alias='endCursor')
647+
end_cursor: typing.Optional[Boolean] = Field(default=False, alias='endCursor')
640648
has_next_page: typing.Optional[Boolean] = Field(default=False, alias='hasNextPage')
641649
has_previous_page: typing.Optional[Boolean] = Field(default=False, alias='hasPreviousPage')
642-
start_cursor: typing.Optional[OutputCursor] = Field(default=None, alias='startCursor')
650+
start_cursor: typing.Optional[Boolean] = Field(default=False, alias='startCursor')
643651

644652

645653
class PageInfoPayload(BaseModel):
646-
end_cursor: typing.Optional[OutputCursorPayload] = Field(default=None, alias='endCursor')
654+
end_cursor: typing.Optional[typing.Optional[Cursor]] = Field(default=None, alias='endCursor')
647655
has_next_page: typing.Optional[typing.Optional[Boolean]] = Field(default=None, alias='hasNextPage')
648656
has_previous_page: typing.Optional[typing.Optional[Boolean]] = Field(default=None, alias='hasPreviousPage')
649-
start_cursor: typing.Optional[OutputCursorPayload] = Field(default=None, alias='startCursor')
657+
start_cursor: typing.Optional[typing.Optional[Cursor]] = Field(default=None, alias='startCursor')
650658

651659

652660
class PoolCapacityPayload(Payload):
@@ -701,8 +709,8 @@ class QueryResourcesQuery(Query):
701709
pool_id: ID = Field(alias='poolId', json_schema_extra={'type': 'ID!'})
702710
first: typing.Optional[Int] = Field(default=None, json_schema_extra={'type': 'Int'})
703711
last: typing.Optional[Int] = Field(default=None, json_schema_extra={'type': 'Int'})
704-
before: typing.Optional[String] = Field(default=None, json_schema_extra={'type': 'String'})
705-
after: typing.Optional[String] = Field(default=None, json_schema_extra={'type': 'String'})
712+
before: typing.Optional[Cursor] = Field(default=None, json_schema_extra={'type': 'Cursor'})
713+
after: typing.Optional[Cursor] = Field(default=None, json_schema_extra={'type': 'Cursor'})
706714
payload: ResourceConnection
707715

708716

@@ -712,8 +720,8 @@ class QueryResourcesByAltIdQuery(Query):
712720
pool_id: typing.Optional[ID] = Field(default=None, alias='poolId', json_schema_extra={'type': 'ID'})
713721
first: typing.Optional[Int] = Field(default=None, json_schema_extra={'type': 'Int'})
714722
last: typing.Optional[Int] = Field(default=None, json_schema_extra={'type': 'Int'})
715-
before: typing.Optional[String] = Field(default=None, json_schema_extra={'type': 'String'})
716-
after: typing.Optional[String] = Field(default=None, json_schema_extra={'type': 'String'})
723+
before: typing.Optional[Cursor] = Field(default=None, json_schema_extra={'type': 'Cursor'})
724+
after: typing.Optional[Cursor] = Field(default=None, json_schema_extra={'type': 'Cursor'})
717725
payload: ResourceConnection
718726

719727

@@ -754,6 +762,7 @@ class QueryEmptyResourcePoolsQuery(Query):
754762
last: typing.Optional[Int] = Field(default=None, json_schema_extra={'type': 'Int'})
755763
before: typing.Optional[Cursor] = Field(default=None, json_schema_extra={'type': 'Cursor'})
756764
after: typing.Optional[Cursor] = Field(default=None, json_schema_extra={'type': 'Cursor'})
765+
sort_by: typing.Optional[SortResourcePoolsInput] = Field(default=None, alias='sortBy', json_schema_extra={'type': 'SortResourcePoolsInput'})
757766
payload: ResourcePoolConnection
758767

759768

@@ -766,6 +775,7 @@ class QueryResourcePoolsQuery(Query):
766775
before: typing.Optional[Cursor] = Field(default=None, json_schema_extra={'type': 'Cursor'})
767776
after: typing.Optional[Cursor] = Field(default=None, json_schema_extra={'type': 'Cursor'})
768777
filter_by_resources: typing.Optional[Map] = Field(default=None, alias='filterByResources', json_schema_extra={'type': 'Map'})
778+
sort_by: typing.Optional[SortResourcePoolsInput] = Field(default=None, alias='sortBy', json_schema_extra={'type': 'SortResourcePoolsInput'})
769779
payload: ResourcePoolConnection
770780

771781

@@ -795,6 +805,7 @@ class QueryRootResourcePoolsQuery(Query):
795805
before: typing.Optional[Cursor] = Field(default=None, json_schema_extra={'type': 'Cursor'})
796806
after: typing.Optional[Cursor] = Field(default=None, json_schema_extra={'type': 'Cursor'})
797807
filter_by_resources: typing.Optional[Map] = Field(default=None, alias='filterByResources', json_schema_extra={'type': 'Map'})
808+
sort_by: typing.Optional[SortResourcePoolsInput] = Field(default=None, alias='sortBy', json_schema_extra={'type': 'SortResourcePoolsInput'})
798809
payload: ResourcePoolConnection
799810

800811

@@ -807,6 +818,7 @@ class QueryLeafResourcePoolsQuery(Query):
807818
before: typing.Optional[Cursor] = Field(default=None, json_schema_extra={'type': 'Cursor'})
808819
after: typing.Optional[Cursor] = Field(default=None, json_schema_extra={'type': 'Cursor'})
809820
filter_by_resources: typing.Optional[Map] = Field(default=None, alias='filterByResources', json_schema_extra={'type': 'Map'})
821+
sort_by: typing.Optional[SortResourcePoolsInput] = Field(default=None, alias='sortBy', json_schema_extra={'type': 'SortResourcePoolsInput'})
810822
payload: ResourcePoolConnection
811823

812824

@@ -1010,12 +1022,12 @@ class ResourceConnectionPayload(BaseModel):
10101022

10111023

10121024
class ResourceEdge(Payload):
1013-
cursor: typing.Optional[OutputCursor] = Field(default=None)
1025+
cursor: typing.Optional[Boolean] = Field(default=False)
10141026
node: typing.Optional[Resource] = Field(default=None)
10151027

10161028

10171029
class ResourceEdgePayload(BaseModel):
1018-
cursor: typing.Optional[OutputCursorPayload] = Field(default=None)
1030+
cursor: typing.Optional[typing.Optional[Cursor]] = Field(default=None)
10191031
node: typing.Optional[ResourcePayload] = Field(default=None)
10201032

10211033

@@ -1028,6 +1040,7 @@ class ResourcePool(Payload):
10281040
pool_type: typing.Optional[Boolean] = Field(default=False, alias='PoolType')
10291041
resource_type: typing.Optional[ResourceType] = Field(default=None, alias='ResourceType')
10301042
resources: typing.Optional[Resource] = Field(default=None, alias='Resources')
1043+
dealocation_safety_period: typing.Optional[Boolean] = Field(default=False, alias='DealocationSafetyPeriod')
10311044
tags: typing.Optional[Tag] = Field(default=None, alias='Tags')
10321045
allocated_resources: typing.Optional[ResourceConnection] = Field(default=None, alias='allocatedResources')
10331046
id: typing.Optional[Boolean] = Field(default=False)
@@ -1042,6 +1055,7 @@ class ResourcePoolPayload(BaseModel):
10421055
pool_type: typing.Optional[typing.Optional[PoolType]] = Field(default=None, alias='PoolType')
10431056
resource_type: typing.Optional[ResourceTypePayload] = Field(default=None, alias='ResourceType')
10441057
resources: typing.Optional[typing.Optional[list[ResourcePayload]]] = Field(default=None, alias='Resources')
1058+
dealocation_safety_period: typing.Optional[typing.Optional[Int]] = Field(default=None, alias='DealocationSafetyPeriod')
10451059
tags: typing.Optional[typing.Optional[list[TagPayload]]] = Field(default=None, alias='Tags')
10461060
allocated_resources: typing.Optional[ResourceConnectionPayload] = Field(default=None, alias='allocatedResources')
10471061
id: typing.Optional[typing.Optional[ID]] = Field(default=None)
@@ -1060,12 +1074,12 @@ class ResourcePoolConnectionPayload(BaseModel):
10601074

10611075

10621076
class ResourcePoolEdge(Payload):
1063-
cursor: typing.Optional[OutputCursor] = Field(default=None)
1077+
cursor: typing.Optional[Boolean] = Field(default=False)
10641078
node: typing.Optional[ResourcePool] = Field(default=None)
10651079

10661080

10671081
class ResourcePoolEdgePayload(BaseModel):
1068-
cursor: typing.Optional[OutputCursorPayload] = Field(default=None)
1082+
cursor: typing.Optional[typing.Optional[Cursor]] = Field(default=None)
10691083
node: typing.Optional[ResourcePoolPayload] = Field(default=None)
10701084

10711085

@@ -1143,6 +1157,7 @@ class UpdateTagPayloadPayload(BaseModel):
11431157
DeleteTagInput.model_rebuild()
11441158
ResourceInput.model_rebuild()
11451159
ResourcePoolInput.model_rebuild()
1160+
SortResourcePoolsInput.model_rebuild()
11461161
TagAnd.model_rebuild()
11471162
TagOr.model_rebuild()
11481163
TagPoolInput.model_rebuild()
@@ -1243,8 +1258,6 @@ class UpdateTagPayloadPayload(BaseModel):
12431258
UpdateResourceTypeNameData.model_rebuild()
12441259
UpdateResourceAltIdMutationResponse.model_rebuild()
12451260
UpdateResourceAltIdData.model_rebuild()
1246-
OutputCursor.model_rebuild()
1247-
OutputCursorPayload.model_rebuild()
12481261
PageInfo.model_rebuild()
12491262
PageInfoPayload.model_rebuild()
12501263
PoolCapacityPayload.model_rebuild()

‎resource-manager/python/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ packages = [{ include = "frinx_api" }]
1818
name = "frinx-resource-manager-api"
1919
description = "Frinx Resource Manager graphql schema transformed to pydantic BaseModels"
2020
authors = ["Jozef Volak <[email protected]>"]
21-
version = "2.0.0"
21+
version = "3.0.0"
2222
readme = ["README.md", "CHANGELOG.md", "RELEASE.md"]
2323
keywords = ["frinx-machine", "resource-manager", "api"]
2424
license = "Apache 2.0"

0 commit comments

Comments
 (0)