maleo-metadata-client 0.0.5__tar.gz → 0.0.7__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of maleo-metadata-client might be problematic. Click here for more details.

Files changed (14) hide show
  1. {maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/PKG-INFO +22 -22
  2. {maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/maleo_metadata_client.egg-info/PKG-INFO +22 -22
  3. {maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/maleo_metadata_client.egg-info/requires.txt +21 -21
  4. {maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/pyproject.toml +22 -22
  5. {maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/src/services/blood_type.py +20 -71
  6. {maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/LICENSE +0 -0
  7. {maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/README.md +0 -0
  8. {maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/maleo_metadata_client.egg-info/SOURCES.txt +0 -0
  9. {maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/maleo_metadata_client.egg-info/dependency_links.txt +0 -0
  10. {maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/maleo_metadata_client.egg-info/top_level.txt +0 -0
  11. {maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/setup.cfg +0 -0
  12. {maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/src/__init__.py +0 -0
  13. {maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/src/manager.py +0 -0
  14. {maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/src/services/__init__.py +0 -0
{maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: maleo-metadata-client
3
- Version: 0.0.5
3
+ Version: 0.0.7
4
4
  Summary: MaleoMetadata client package
5
5
  Author-email: Agra Bima Yuda <agra@nexmedis.com>
6
6
  License: MIT
@@ -25,12 +25,12 @@ Requires-Dist: distlib>=0.4.0
25
25
  Requires-Dist: dnspython>=2.8.0
26
26
  Requires-Dist: elastic-transport>=9.1.0
27
27
  Requires-Dist: elasticsearch>=9.1.1
28
- Requires-Dist: fastapi>=0.118.0
29
- Requires-Dist: filelock>=3.19.1
30
- Requires-Dist: google-api-core>=2.25.2
28
+ Requires-Dist: fastapi>=0.119.0
29
+ Requires-Dist: filelock>=3.20.0
30
+ Requires-Dist: google-api-core>=2.26.0
31
31
  Requires-Dist: google-auth>=2.41.1
32
32
  Requires-Dist: google-cloud-appengine-logging>=1.6.2
33
- Requires-Dist: google-cloud-audit-log>=0.3.2
33
+ Requires-Dist: google-cloud-audit-log>=0.3.3
34
34
  Requires-Dist: google-cloud-core>=2.4.3
35
35
  Requires-Dist: google-cloud-logging>=3.12.1
36
36
  Requires-Dist: google-cloud-pubsub>=2.31.1
@@ -50,18 +50,18 @@ Requires-Dist: identify>=2.6.15
50
50
  Requires-Dist: idna>=3.10
51
51
  Requires-Dist: importlib_metadata>=8.7.0
52
52
  Requires-Dist: iniconfig>=2.1.0
53
- Requires-Dist: maleo-crypto>=0.0.17
54
- Requires-Dist: maleo-database>=0.0.85
55
- Requires-Dist: maleo-enums>=0.0.27
56
- Requires-Dist: maleo-google>=0.0.71
57
- Requires-Dist: maleo-infra>=0.0.85
58
- Requires-Dist: maleo-logging>=0.0.27
59
- Requires-Dist: maleo-managers>=0.0.65
60
- Requires-Dist: maleo-metadata>=0.2.99
61
- Requires-Dist: maleo-middlewares>=0.0.71
62
- Requires-Dist: maleo-schemas>=0.1.1
63
- Requires-Dist: maleo-types>=0.0.7
64
- Requires-Dist: maleo-utils>=0.0.27
53
+ Requires-Dist: maleo-crypto>=0.0.28
54
+ Requires-Dist: maleo-database>=0.1.42
55
+ Requires-Dist: maleo-enums>=0.0.28
56
+ Requires-Dist: maleo-google>=0.1.2
57
+ Requires-Dist: maleo-infra>=0.1.42
58
+ Requires-Dist: maleo-logging>=0.0.28
59
+ Requires-Dist: maleo-managers>=0.0.82
60
+ Requires-Dist: maleo-metadata>=0.3.32
61
+ Requires-Dist: maleo-middlewares>=0.1.2
62
+ Requires-Dist: maleo-schemas>=0.1.42
63
+ Requires-Dist: maleo-types>=0.0.8
64
+ Requires-Dist: maleo-utils>=0.0.28
65
65
  Requires-Dist: motor>=3.7.1
66
66
  Requires-Dist: mypy_extensions>=1.1.0
67
67
  Requires-Dist: nodeenv>=1.9.1
@@ -70,7 +70,7 @@ Requires-Dist: opentelemetry-sdk>=1.37.0
70
70
  Requires-Dist: opentelemetry-semantic-conventions>=0.58b0
71
71
  Requires-Dist: packaging>=25.0
72
72
  Requires-Dist: pathspec>=0.12.1
73
- Requires-Dist: platformdirs>=4.4.0
73
+ Requires-Dist: platformdirs>=4.5.0
74
74
  Requires-Dist: pluggy>=1.6.0
75
75
  Requires-Dist: pre_commit>=4.3.0
76
76
  Requires-Dist: proto-plus>=1.26.1
@@ -80,9 +80,9 @@ Requires-Dist: pyasn1>=0.6.1
80
80
  Requires-Dist: pyasn1_modules>=0.4.2
81
81
  Requires-Dist: pycparser>=2.23
82
82
  Requires-Dist: pycryptodome>=3.23.0
83
- Requires-Dist: pydantic>=2.11.10
83
+ Requires-Dist: pydantic>=2.12.0
84
84
  Requires-Dist: pydantic-settings>=2.11.0
85
- Requires-Dist: pydantic_core>=2.33.2
85
+ Requires-Dist: pydantic_core>=2.41.1
86
86
  Requires-Dist: Pygments>=2.19.2
87
87
  Requires-Dist: PyJWT>=2.10.1
88
88
  Requires-Dist: pymongo>=4.15.2
@@ -96,7 +96,7 @@ Requires-Dist: requests>=2.32.5
96
96
  Requires-Dist: rsa>=4.9.1
97
97
  Requires-Dist: six>=1.17.0
98
98
  Requires-Dist: sniffio>=1.3.1
99
- Requires-Dist: SQLAlchemy>=2.0.43
99
+ Requires-Dist: SQLAlchemy>=2.0.44
100
100
  Requires-Dist: starlette>=0.48.0
101
101
  Requires-Dist: typing-inspection>=0.4.2
102
102
  Requires-Dist: typing_extensions>=4.15.0
@@ -104,7 +104,7 @@ Requires-Dist: ua-parser>=1.0.1
104
104
  Requires-Dist: ua-parser-builtins>=0.18.0.post1
105
105
  Requires-Dist: urllib3>=2.5.0
106
106
  Requires-Dist: user-agents>=2.2.0
107
- Requires-Dist: virtualenv>=20.34.0
107
+ Requires-Dist: virtualenv>=20.35.3
108
108
  Requires-Dist: zipp>=3.23.0
109
109
  Dynamic: license-file
110
110
 
{maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/maleo_metadata_client.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: maleo-metadata-client
3
- Version: 0.0.5
3
+ Version: 0.0.7
4
4
  Summary: MaleoMetadata client package
5
5
  Author-email: Agra Bima Yuda <agra@nexmedis.com>
6
6
  License: MIT
@@ -25,12 +25,12 @@ Requires-Dist: distlib>=0.4.0
25
25
  Requires-Dist: dnspython>=2.8.0
26
26
  Requires-Dist: elastic-transport>=9.1.0
27
27
  Requires-Dist: elasticsearch>=9.1.1
28
- Requires-Dist: fastapi>=0.118.0
29
- Requires-Dist: filelock>=3.19.1
30
- Requires-Dist: google-api-core>=2.25.2
28
+ Requires-Dist: fastapi>=0.119.0
29
+ Requires-Dist: filelock>=3.20.0
30
+ Requires-Dist: google-api-core>=2.26.0
31
31
  Requires-Dist: google-auth>=2.41.1
32
32
  Requires-Dist: google-cloud-appengine-logging>=1.6.2
33
- Requires-Dist: google-cloud-audit-log>=0.3.2
33
+ Requires-Dist: google-cloud-audit-log>=0.3.3
34
34
  Requires-Dist: google-cloud-core>=2.4.3
35
35
  Requires-Dist: google-cloud-logging>=3.12.1
36
36
  Requires-Dist: google-cloud-pubsub>=2.31.1
@@ -50,18 +50,18 @@ Requires-Dist: identify>=2.6.15
50
50
  Requires-Dist: idna>=3.10
51
51
  Requires-Dist: importlib_metadata>=8.7.0
52
52
  Requires-Dist: iniconfig>=2.1.0
53
- Requires-Dist: maleo-crypto>=0.0.17
54
- Requires-Dist: maleo-database>=0.0.85
55
- Requires-Dist: maleo-enums>=0.0.27
56
- Requires-Dist: maleo-google>=0.0.71
57
- Requires-Dist: maleo-infra>=0.0.85
58
- Requires-Dist: maleo-logging>=0.0.27
59
- Requires-Dist: maleo-managers>=0.0.65
60
- Requires-Dist: maleo-metadata>=0.2.99
61
- Requires-Dist: maleo-middlewares>=0.0.71
62
- Requires-Dist: maleo-schemas>=0.1.1
63
- Requires-Dist: maleo-types>=0.0.7
64
- Requires-Dist: maleo-utils>=0.0.27
53
+ Requires-Dist: maleo-crypto>=0.0.28
54
+ Requires-Dist: maleo-database>=0.1.42
55
+ Requires-Dist: maleo-enums>=0.0.28
56
+ Requires-Dist: maleo-google>=0.1.2
57
+ Requires-Dist: maleo-infra>=0.1.42
58
+ Requires-Dist: maleo-logging>=0.0.28
59
+ Requires-Dist: maleo-managers>=0.0.82
60
+ Requires-Dist: maleo-metadata>=0.3.32
61
+ Requires-Dist: maleo-middlewares>=0.1.2
62
+ Requires-Dist: maleo-schemas>=0.1.42
63
+ Requires-Dist: maleo-types>=0.0.8
64
+ Requires-Dist: maleo-utils>=0.0.28
65
65
  Requires-Dist: motor>=3.7.1
66
66
  Requires-Dist: mypy_extensions>=1.1.0
67
67
  Requires-Dist: nodeenv>=1.9.1
@@ -70,7 +70,7 @@ Requires-Dist: opentelemetry-sdk>=1.37.0
70
70
  Requires-Dist: opentelemetry-semantic-conventions>=0.58b0
71
71
  Requires-Dist: packaging>=25.0
72
72
  Requires-Dist: pathspec>=0.12.1
73
- Requires-Dist: platformdirs>=4.4.0
73
+ Requires-Dist: platformdirs>=4.5.0
74
74
  Requires-Dist: pluggy>=1.6.0
75
75
  Requires-Dist: pre_commit>=4.3.0
76
76
  Requires-Dist: proto-plus>=1.26.1
@@ -80,9 +80,9 @@ Requires-Dist: pyasn1>=0.6.1
80
80
  Requires-Dist: pyasn1_modules>=0.4.2
81
81
  Requires-Dist: pycparser>=2.23
82
82
  Requires-Dist: pycryptodome>=3.23.0
83
- Requires-Dist: pydantic>=2.11.10
83
+ Requires-Dist: pydantic>=2.12.0
84
84
  Requires-Dist: pydantic-settings>=2.11.0
85
- Requires-Dist: pydantic_core>=2.33.2
85
+ Requires-Dist: pydantic_core>=2.41.1
86
86
  Requires-Dist: Pygments>=2.19.2
87
87
  Requires-Dist: PyJWT>=2.10.1
88
88
  Requires-Dist: pymongo>=4.15.2
@@ -96,7 +96,7 @@ Requires-Dist: requests>=2.32.5
96
96
  Requires-Dist: rsa>=4.9.1
97
97
  Requires-Dist: six>=1.17.0
98
98
  Requires-Dist: sniffio>=1.3.1
99
- Requires-Dist: SQLAlchemy>=2.0.43
99
+ Requires-Dist: SQLAlchemy>=2.0.44
100
100
  Requires-Dist: starlette>=0.48.0
101
101
  Requires-Dist: typing-inspection>=0.4.2
102
102
  Requires-Dist: typing_extensions>=4.15.0
@@ -104,7 +104,7 @@ Requires-Dist: ua-parser>=1.0.1
104
104
  Requires-Dist: ua-parser-builtins>=0.18.0.post1
105
105
  Requires-Dist: urllib3>=2.5.0
106
106
  Requires-Dist: user-agents>=2.2.0
107
- Requires-Dist: virtualenv>=20.34.0
107
+ Requires-Dist: virtualenv>=20.35.3
108
108
  Requires-Dist: zipp>=3.23.0
109
109
  Dynamic: license-file
110
110
 
{maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/maleo_metadata_client.egg-info/requires.txt RENAMED
@@ -16,12 +16,12 @@ distlib>=0.4.0
16
16
  dnspython>=2.8.0
17
17
  elastic-transport>=9.1.0
18
18
  elasticsearch>=9.1.1
19
- fastapi>=0.118.0
20
- filelock>=3.19.1
21
- google-api-core>=2.25.2
19
+ fastapi>=0.119.0
20
+ filelock>=3.20.0
21
+ google-api-core>=2.26.0
22
22
  google-auth>=2.41.1
23
23
  google-cloud-appengine-logging>=1.6.2
24
- google-cloud-audit-log>=0.3.2
24
+ google-cloud-audit-log>=0.3.3
25
25
  google-cloud-core>=2.4.3
26
26
  google-cloud-logging>=3.12.1
27
27
  google-cloud-pubsub>=2.31.1
@@ -41,18 +41,18 @@ identify>=2.6.15
41
41
  idna>=3.10
42
42
  importlib_metadata>=8.7.0
43
43
  iniconfig>=2.1.0
44
- maleo-crypto>=0.0.17
45
- maleo-database>=0.0.85
46
- maleo-enums>=0.0.27
47
- maleo-google>=0.0.71
48
- maleo-infra>=0.0.85
49
- maleo-logging>=0.0.27
50
- maleo-managers>=0.0.65
51
- maleo-metadata>=0.2.99
52
- maleo-middlewares>=0.0.71
53
- maleo-schemas>=0.1.1
54
- maleo-types>=0.0.7
55
- maleo-utils>=0.0.27
44
+ maleo-crypto>=0.0.28
45
+ maleo-database>=0.1.42
46
+ maleo-enums>=0.0.28
47
+ maleo-google>=0.1.2
48
+ maleo-infra>=0.1.42
49
+ maleo-logging>=0.0.28
50
+ maleo-managers>=0.0.82
51
+ maleo-metadata>=0.3.32
52
+ maleo-middlewares>=0.1.2
53
+ maleo-schemas>=0.1.42
54
+ maleo-types>=0.0.8
55
+ maleo-utils>=0.0.28
56
56
  motor>=3.7.1
57
57
  mypy_extensions>=1.1.0
58
58
  nodeenv>=1.9.1
@@ -61,7 +61,7 @@ opentelemetry-sdk>=1.37.0
61
61
  opentelemetry-semantic-conventions>=0.58b0
62
62
  packaging>=25.0
63
63
  pathspec>=0.12.1
64
- platformdirs>=4.4.0
64
+ platformdirs>=4.5.0
65
65
  pluggy>=1.6.0
66
66
  pre_commit>=4.3.0
67
67
  proto-plus>=1.26.1
@@ -71,9 +71,9 @@ pyasn1>=0.6.1
71
71
  pyasn1_modules>=0.4.2
72
72
  pycparser>=2.23
73
73
  pycryptodome>=3.23.0
74
- pydantic>=2.11.10
74
+ pydantic>=2.12.0
75
75
  pydantic-settings>=2.11.0
76
- pydantic_core>=2.33.2
76
+ pydantic_core>=2.41.1
77
77
  Pygments>=2.19.2
78
78
  PyJWT>=2.10.1
79
79
  pymongo>=4.15.2
@@ -87,7 +87,7 @@ requests>=2.32.5
87
87
  rsa>=4.9.1
88
88
  six>=1.17.0
89
89
  sniffio>=1.3.1
90
- SQLAlchemy>=2.0.43
90
+ SQLAlchemy>=2.0.44
91
91
  starlette>=0.48.0
92
92
  typing-inspection>=0.4.2
93
93
  typing_extensions>=4.15.0
@@ -95,5 +95,5 @@ ua-parser>=1.0.1
95
95
  ua-parser-builtins>=0.18.0.post1
96
96
  urllib3>=2.5.0
97
97
  user-agents>=2.2.0
98
- virtualenv>=20.34.0
98
+ virtualenv>=20.35.3
99
99
  zipp>=3.23.0
{maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/pyproject.toml RENAMED
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "maleo-metadata-client" # PyPI package name
7
- version = "0.0.5"
7
+ version = "0.0.7"
8
8
  description = "MaleoMetadata client package"
9
9
  authors = [
10
10
  { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }
@@ -31,12 +31,12 @@ dependencies = [
31
31
  "dnspython>=2.8.0",
32
32
  "elastic-transport>=9.1.0",
33
33
  "elasticsearch>=9.1.1",
34
- "fastapi>=0.118.0",
35
- "filelock>=3.19.1",
36
- "google-api-core>=2.25.2",
34
+ "fastapi>=0.119.0",
35
+ "filelock>=3.20.0",
36
+ "google-api-core>=2.26.0",
37
37
  "google-auth>=2.41.1",
38
38
  "google-cloud-appengine-logging>=1.6.2",
39
- "google-cloud-audit-log>=0.3.2",
39
+ "google-cloud-audit-log>=0.3.3",
40
40
  "google-cloud-core>=2.4.3",
41
41
  "google-cloud-logging>=3.12.1",
42
42
  "google-cloud-pubsub>=2.31.1",
@@ -56,18 +56,18 @@ dependencies = [
56
56
  "idna>=3.10",
57
57
  "importlib_metadata>=8.7.0",
58
58
  "iniconfig>=2.1.0",
59
- "maleo-crypto>=0.0.17",
60
- "maleo-database>=0.0.85",
61
- "maleo-enums>=0.0.27",
62
- "maleo-google>=0.0.71",
63
- "maleo-infra>=0.0.85",
64
- "maleo-logging>=0.0.27",
65
- "maleo-managers>=0.0.65",
66
- "maleo-metadata>=0.2.99",
67
- "maleo-middlewares>=0.0.71",
68
- "maleo-schemas>=0.1.1",
69
- "maleo-types>=0.0.7",
70
- "maleo-utils>=0.0.27",
59
+ "maleo-crypto>=0.0.28",
60
+ "maleo-database>=0.1.42",
61
+ "maleo-enums>=0.0.28",
62
+ "maleo-google>=0.1.2",
63
+ "maleo-infra>=0.1.42",
64
+ "maleo-logging>=0.0.28",
65
+ "maleo-managers>=0.0.82",
66
+ "maleo-metadata>=0.3.32",
67
+ "maleo-middlewares>=0.1.2",
68
+ "maleo-schemas>=0.1.42",
69
+ "maleo-types>=0.0.8",
70
+ "maleo-utils>=0.0.28",
71
71
  "motor>=3.7.1",
72
72
  "mypy_extensions>=1.1.0",
73
73
  "nodeenv>=1.9.1",
@@ -76,7 +76,7 @@ dependencies = [
76
76
  "opentelemetry-semantic-conventions>=0.58b0",
77
77
  "packaging>=25.0",
78
78
  "pathspec>=0.12.1",
79
- "platformdirs>=4.4.0",
79
+ "platformdirs>=4.5.0",
80
80
  "pluggy>=1.6.0",
81
81
  "pre_commit>=4.3.0",
82
82
  "proto-plus>=1.26.1",
@@ -86,9 +86,9 @@ dependencies = [
86
86
  "pyasn1_modules>=0.4.2",
87
87
  "pycparser>=2.23",
88
88
  "pycryptodome>=3.23.0",
89
- "pydantic>=2.11.10",
89
+ "pydantic>=2.12.0",
90
90
  "pydantic-settings>=2.11.0",
91
- "pydantic_core>=2.33.2",
91
+ "pydantic_core>=2.41.1",
92
92
  "Pygments>=2.19.2",
93
93
  "PyJWT>=2.10.1",
94
94
  "pymongo>=4.15.2",
@@ -102,7 +102,7 @@ dependencies = [
102
102
  "rsa>=4.9.1",
103
103
  "six>=1.17.0",
104
104
  "sniffio>=1.3.1",
105
- "SQLAlchemy>=2.0.43",
105
+ "SQLAlchemy>=2.0.44",
106
106
  "starlette>=0.48.0",
107
107
  "typing-inspection>=0.4.2",
108
108
  "typing_extensions>=4.15.0",
@@ -110,7 +110,7 @@ dependencies = [
110
110
  "ua-parser-builtins>=0.18.0.post1",
111
111
  "urllib3>=2.5.0",
112
112
  "user-agents>=2.2.0",
113
- "virtualenv>=20.34.0",
113
+ "virtualenv>=20.35.3",
114
114
  "zipp>=3.23.0",
115
115
  ]
116
116
 
{maleo_metadata_client-0.0.5 → maleo_metadata_client-0.0.7}/src/services/blood_type.py RENAMED
@@ -10,20 +10,17 @@ from maleo.enums.connection import Header
10
10
  from maleo.logging.enums import Level
11
11
  from maleo.managers.client.maleo.config import MaleoMetadataClientConfig
12
12
  from maleo.managers.client.maleo import MaleoClientService
13
- from maleo.metadata.constants.blood_type import RESOURCE
14
- from maleo.metadata.dtos.blood_type import (
13
+ from maleo.metadata.constants.blood_type import BLOOD_TYPE_RESOURCE
14
+ from maleo.metadata.schemas.blood_type import (
15
15
  ReadMultipleParameter,
16
16
  ReadSingleParameter,
17
- BasicBloodTypeData,
18
- StandardBloodTypeData,
19
- FullBloodTypeData,
17
+ StandardBloodTypeSchema,
18
+ FullBloodTypeSchema,
20
19
  )
21
20
  from maleo.metadata.enums.blood_type import Granularity
22
- from maleo.metadata.utils.blood_type import get_data_model
21
+ from maleo.metadata.utils.blood_type import get_schema_model
23
22
  from maleo.schemas.connection import ConnectionContext
24
23
  from maleo.schemas.exception.factory import Factory as MaleoExceptionFactory
25
- from maleo.schemas.mixins.filter import convert as convert_filter
26
- from maleo.schemas.mixins.sort import convert as convert_sort
27
24
  from maleo.schemas.operation.action.resource import ReadResourceOperationAction
28
25
  from maleo.schemas.operation.enums import OperationType, Target
29
26
  from maleo.schemas.operation.mixins import Timestamp
@@ -49,22 +46,8 @@ from maleo.utils.merger import merge_dicts
49
46
 
50
47
 
51
48
  class BloodTypeClientService(MaleoClientService[MaleoMetadataClientConfig]):
52
- resource = RESOURCE
49
+ resource = BLOOD_TYPE_RESOURCE
53
50
 
54
- @overload
55
- async def read(
56
- self,
57
- cardinality: Literal[Cardinality.MULTIPLE],
58
- granularity: Literal[Granularity.BASIC],
59
- *,
60
- operation_id: UUID,
61
- resource_operation_action: ReadResourceOperationAction,
62
- connection_context: ConnectionContext,
63
- authorization: OptionalAnyAuthorization = None,
64
- impersonation: OptionalImpersonation = None,
65
- parameters: ReadMultipleParameter,
66
- headers: OptionalStringToStringDict = None,
67
- ) -> ReadMultipleDataResponse[BasicBloodTypeData, StrictPagination, None]: ...
68
51
  @overload
69
52
  async def read(
70
53
  self,
@@ -78,7 +61,7 @@ class BloodTypeClientService(MaleoClientService[MaleoMetadataClientConfig]):
78
61
  impersonation: OptionalImpersonation = None,
79
62
  parameters: ReadMultipleParameter,
80
63
  headers: OptionalStringToStringDict = None,
81
- ) -> ReadMultipleDataResponse[StandardBloodTypeData, StrictPagination, None]: ...
64
+ ) -> ReadMultipleDataResponse[StandardBloodTypeSchema, StrictPagination, None]: ...
82
65
  @overload
83
66
  async def read(
84
67
  self,
@@ -92,21 +75,7 @@ class BloodTypeClientService(MaleoClientService[MaleoMetadataClientConfig]):
92
75
  impersonation: OptionalImpersonation = None,
93
76
  parameters: ReadMultipleParameter,
94
77
  headers: OptionalStringToStringDict = None,
95
- ) -> ReadMultipleDataResponse[FullBloodTypeData, StrictPagination, None]: ...
96
- @overload
97
- async def read(
98
- self,
99
- cardinality: Literal[Cardinality.SINGLE],
100
- granularity: Literal[Granularity.BASIC],
101
- *,
102
- operation_id: UUID,
103
- resource_operation_action: ReadResourceOperationAction,
104
- connection_context: ConnectionContext,
105
- authorization: OptionalAnyAuthorization = None,
106
- impersonation: OptionalImpersonation = None,
107
- parameters: ReadSingleParameter,
108
- headers: OptionalStringToStringDict = None,
109
- ) -> ReadSingleDataResponse[BasicBloodTypeData, None]: ...
78
+ ) -> ReadMultipleDataResponse[FullBloodTypeSchema, StrictPagination, None]: ...
110
79
  @overload
111
80
  async def read(
112
81
  self,
@@ -120,7 +89,7 @@ class BloodTypeClientService(MaleoClientService[MaleoMetadataClientConfig]):
120
89
  impersonation: OptionalImpersonation = None,
121
90
  parameters: ReadSingleParameter,
122
91
  headers: OptionalStringToStringDict = None,
123
- ) -> ReadSingleDataResponse[StandardBloodTypeData, None]: ...
92
+ ) -> ReadSingleDataResponse[StandardBloodTypeSchema, None]: ...
124
93
  @overload
125
94
  async def read(
126
95
  self,
@@ -134,7 +103,7 @@ class BloodTypeClientService(MaleoClientService[MaleoMetadataClientConfig]):
134
103
  impersonation: OptionalImpersonation = None,
135
104
  parameters: ReadSingleParameter,
136
105
  headers: OptionalStringToStringDict = None,
137
- ) -> ReadSingleDataResponse[FullBloodTypeData, None]: ...
106
+ ) -> ReadSingleDataResponse[FullBloodTypeSchema, None]: ...
138
107
  async def read(
139
108
  self,
140
109
  cardinality: Cardinality,
@@ -148,15 +117,13 @@ class BloodTypeClientService(MaleoClientService[MaleoMetadataClientConfig]):
148
117
  parameters: Union[ReadMultipleParameter, ReadSingleParameter],
149
118
  headers: OptionalStringToStringDict = None,
150
119
  ) -> Union[
151
- ReadMultipleDataResponse[BasicBloodTypeData, StrictPagination, None],
152
- ReadMultipleDataResponse[StandardBloodTypeData, StrictPagination, None],
153
- ReadMultipleDataResponse[FullBloodTypeData, StrictPagination, None],
154
- ReadSingleDataResponse[BasicBloodTypeData, None],
155
- ReadSingleDataResponse[StandardBloodTypeData, None],
156
- ReadSingleDataResponse[FullBloodTypeData, None],
120
+ ReadMultipleDataResponse[StandardBloodTypeSchema, StrictPagination, None],
121
+ ReadMultipleDataResponse[FullBloodTypeSchema, StrictPagination, None],
122
+ ReadSingleDataResponse[StandardBloodTypeSchema, None],
123
+ ReadSingleDataResponse[FullBloodTypeSchema, None],
157
124
  ]:
158
125
  redis_client = self._redis.manager.client.get(Connection.ASYNC)
159
- data_model_cls = get_data_model(granularity)
126
+ data_model_cls = get_schema_model(granularity)
160
127
 
161
128
  executed_at = datetime.now(tz=timezone.utc)
162
129
 
@@ -219,7 +186,7 @@ class BloodTypeClientService(MaleoClientService[MaleoMetadataClientConfig]):
219
186
  action=resource_operation_action,
220
187
  resource=self.resource,
221
188
  timestamp=operation_timestamp,
222
- summary=f"Successfully retrieved {cardinality} {granularity} blood type(s) from cache",
189
+ summary=f"Successfully retrieved {cardinality} {granularity} blood type from cache",
223
190
  connection_context=connection_context,
224
191
  authentication=None,
225
192
  authorization=authorization,
@@ -259,28 +226,10 @@ class BloodTypeClientService(MaleoClientService[MaleoMetadataClientConfig]):
259
226
  if isinstance(parameters, ReadMultipleParameter):
260
227
  url = f"{self._config.url}/v1/{self.resource.identifiers[0].slug}/"
261
228
  parameters.date_filters
262
- params = parameters.model_dump(
263
- mode="json",
264
- include={
265
- "ids",
266
- "uuids",
267
- "statuses",
268
- "keys",
269
- "names",
270
- "search",
271
- "page",
272
- "limit",
273
- "granularity",
274
- "use_cache",
275
- },
276
- )
277
- params["filters"] = convert_filter(parameters.date_filters)
278
- params["sorts"] = convert_sort(parameters.sort_columns)
229
+ params = parameters.to_query_params()
279
230
  elif isinstance(parameters, ReadSingleParameter):
280
231
  url = f"{self._config.url}/v1/{self.resource.identifiers[0].slug}/{parameters.identifier}/{parameters.value}"
281
- params = parameters.model_dump(
282
- mode="json", include={"granularity", "use_cache"}
283
- )
232
+ params = parameters.to_query_params()
284
233
 
285
234
  response = await http_client.get(
286
235
  url, params=params, headers=headers, auth=auth
@@ -319,7 +268,7 @@ class BloodTypeClientService(MaleoClientService[MaleoMetadataClientConfig]):
319
268
  id=operation_id,
320
269
  context=operation_context,
321
270
  action=resource_operation_action,
322
- resource=RESOURCE,
271
+ resource=BLOOD_TYPE_RESOURCE,
323
272
  timestamp=operation_timestamp,
324
273
  summary=f"Successfully retrieved multiple {granularity} blood types from microservice",
325
274
  connection_context=connection_context,
@@ -340,7 +289,7 @@ class BloodTypeClientService(MaleoClientService[MaleoMetadataClientConfig]):
340
289
  id=operation_id,
341
290
  context=operation_context,
342
291
  action=resource_operation_action,
343
- resource=RESOURCE,
292
+ resource=BLOOD_TYPE_RESOURCE,
344
293
  timestamp=operation_timestamp,
345
294
  summary=f"Successfully retrieved single {granularity} blood type from microservice",
346
295
  connection_context=connection_context,