maleo-foundation 0.1.54__py3-none-any.whl → 0.1.56__py3-none-any.whl
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.
- maleo_foundation/managers/client/base.py +1 -7
- maleo_foundation/managers/client/maleo.py +18 -2
- maleo_foundation/managers/service.py +0 -7
- {maleo_foundation-0.1.54.dist-info → maleo_foundation-0.1.56.dist-info}/METADATA +1 -1
- {maleo_foundation-0.1.54.dist-info → maleo_foundation-0.1.56.dist-info}/RECORD +7 -7
- {maleo_foundation-0.1.54.dist-info → maleo_foundation-0.1.56.dist-info}/WHEEL +0 -0
- {maleo_foundation-0.1.54.dist-info → maleo_foundation-0.1.56.dist-info}/top_level.txt +0 -0
@@ -4,7 +4,6 @@ from pydantic import BaseModel, Field
|
|
4
4
|
from typing import AsyncGenerator
|
5
5
|
from maleo_foundation.types import BaseTypes
|
6
6
|
from maleo_foundation.utils.logging import ClientLogger, SimpleConfig
|
7
|
-
from maleo_foundation.managers.service import ServiceManager
|
8
7
|
|
9
8
|
class URL(BaseModel):
|
10
9
|
base:str = Field(..., description="Base URL")
|
@@ -54,14 +53,9 @@ class ClientControllerManagers(BaseModel):
|
|
54
53
|
arbitrary_types_allowed=True
|
55
54
|
|
56
55
|
class ClientHTTPController:
|
57
|
-
def __init__(self,
|
58
|
-
self._service_manager = service_manager
|
56
|
+
def __init__(self, manager:ClientHTTPControllerManager):
|
59
57
|
self._manager = manager
|
60
58
|
|
61
|
-
@property
|
62
|
-
def service_manager(self) -> ServiceManager:
|
63
|
-
return self._service_manager
|
64
|
-
|
65
59
|
@property
|
66
60
|
def manager(self) -> ClientHTTPControllerManager:
|
67
61
|
return self._manager
|
@@ -1,6 +1,22 @@
|
|
1
|
-
from
|
1
|
+
from pydantic import BaseModel, Field
|
2
|
+
from maleo_foundation.managers.client.base import ClientManager, ClientHTTPControllerManager, ClientControllerManagers, ClientHTTPController, ClientServiceControllers, ClientControllers
|
2
3
|
from maleo_foundation.managers.service import ServiceManager
|
3
4
|
|
5
|
+
class MaleoClientHTTPController(ClientHTTPController):
|
6
|
+
def __init__(self, service_manager:ServiceManager, manager:ClientHTTPControllerManager):
|
7
|
+
self._service_manager = service_manager
|
8
|
+
super().__init__(manager)
|
9
|
+
|
10
|
+
@property
|
11
|
+
def service_manager(self) -> ServiceManager:
|
12
|
+
return self._service_manager
|
13
|
+
|
14
|
+
class MaleoClientServiceControllers(ClientServiceControllers):
|
15
|
+
http:MaleoClientHTTPController = Field(..., description="Maleo's HTTP Client Controller")
|
16
|
+
|
17
|
+
class Config:
|
18
|
+
arbitrary_types_allowed=True
|
19
|
+
|
4
20
|
class MaleoClientManager(ClientManager):
|
5
21
|
def __init__(
|
6
22
|
self,
|
@@ -9,8 +25,8 @@ class MaleoClientManager(ClientManager):
|
|
9
25
|
url:str,
|
10
26
|
service_manager:ServiceManager
|
11
27
|
):
|
12
|
-
super().__init__(key, name, service_manager)
|
13
28
|
self._url = url
|
29
|
+
super().__init__(key, name, service_manager.log_config, service_manager.configs.service.key)
|
14
30
|
|
15
31
|
def _initialize_controllers(self) -> None:
|
16
32
|
#* Initialize managers
|
@@ -86,12 +86,6 @@ class MiddlewareStaticConfigurations(BaseModel):
|
|
86
86
|
class Config:
|
87
87
|
arbitrary_types_allowed=True
|
88
88
|
|
89
|
-
class GoogleCloudStorageConfigurations(BaseModel):
|
90
|
-
bucket_name:str = Field(..., description="Bucket's name")
|
91
|
-
|
92
|
-
class GoogleClientConfigurations(BaseModel):
|
93
|
-
storage:GoogleCloudStorageConfigurations = Field(..., description="Google cloud storage client configurations")
|
94
|
-
|
95
89
|
class MaleoClientConfiguration(BaseModel):
|
96
90
|
key:str = Field(..., description="Client's key")
|
97
91
|
name:str = Field(..., description="Client's name")
|
@@ -115,7 +109,6 @@ class MaleoClientConfigurations(BaseModel):
|
|
115
109
|
arbitrary_types_allowed=True
|
116
110
|
|
117
111
|
class ClientConfigurations(BaseModel):
|
118
|
-
google:GoogleClientConfigurations = Field(..., description="Google client's configurations")
|
119
112
|
maleo:MaleoClientConfigurations = Field(..., description="Maleo client's configurations")
|
120
113
|
|
121
114
|
class Config:
|
@@ -17,10 +17,10 @@ maleo_foundation/expanded_types/token.py,sha256=4fRTJw6W5MYq71NksNrWNi7qYHQ4_lQw
|
|
17
17
|
maleo_foundation/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
18
18
|
maleo_foundation/managers/db.py,sha256=Pn5EZ-c1Hy6-BihN7KokHJWmBIt3Ty96fZ0zF-srtF4,5208
|
19
19
|
maleo_foundation/managers/middleware.py,sha256=7CDXPMb28AR7J72TWOeKFxOlMypKezEtO9mr53a88B0,4032
|
20
|
-
maleo_foundation/managers/service.py,sha256=
|
20
|
+
maleo_foundation/managers/service.py,sha256=3PY_iQHbUXJ6LcCZh-t-kPqaNsLruDP97VH1ZTyAIY4,16923
|
21
21
|
maleo_foundation/managers/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
22
|
-
maleo_foundation/managers/client/base.py,sha256=
|
23
|
-
maleo_foundation/managers/client/maleo.py,sha256=
|
22
|
+
maleo_foundation/managers/client/base.py,sha256=qfWu_wxoPSSzgZwuTEwRiXERg60diAkz65Qk3fnQej4,3972
|
23
|
+
maleo_foundation/managers/client/maleo.py,sha256=G6C0rn_5c1MEmnoZkJbyXptfoDEofgC5BwLzfQC4NEk,1886
|
24
24
|
maleo_foundation/managers/client/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
25
25
|
maleo_foundation/managers/client/google/base.py,sha256=j3W18Pmcu9jJ5wK12bbWBI6r8cVt5f7QmGU9uIJgKrU,1249
|
26
26
|
maleo_foundation/managers/client/google/secret.py,sha256=Uh01RoOp8QOIvu8X4AGJzOJRlrfAeXHO8ZFvmKo7A-E,3114
|
@@ -72,7 +72,7 @@ maleo_foundation/utils/loaders/__init__.py,sha256=Dnuv7BWyglSddnbsFb96s-b3KaW7UK
|
|
72
72
|
maleo_foundation/utils/loaders/json.py,sha256=NsXLq3VZSgzmEf99tV1VtrmiudWdQ8Pzh_hI4Rm0cM8,397
|
73
73
|
maleo_foundation/utils/loaders/key.py,sha256=GZ4h1ONfp6Xx8-E8AWoGP4ajAZrwPhZRtidjn_u82Qg,2562
|
74
74
|
maleo_foundation/utils/loaders/yaml.py,sha256=jr8v3BlgmRCMTzdNgKhIYt1tnubaJXcDSSGkKVR8pbw,362
|
75
|
-
maleo_foundation-0.1.
|
76
|
-
maleo_foundation-0.1.
|
77
|
-
maleo_foundation-0.1.
|
78
|
-
maleo_foundation-0.1.
|
75
|
+
maleo_foundation-0.1.56.dist-info/METADATA,sha256=PfOgR1rF6U-ZKpcqhTlBx3lL6PF6IDVbHqztIo058PA,3354
|
76
|
+
maleo_foundation-0.1.56.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
|
77
|
+
maleo_foundation-0.1.56.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
|
78
|
+
maleo_foundation-0.1.56.dist-info/RECORD,,
|
File without changes
|
File without changes
|