chore: fixed some deprecations

For #196
RWTH-EBC · Jul 17, 2023 · 6e127d7 · 6e127d7
1 parent 2d87ca0
commit 6e127d7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/filip/clients/base_http_client.py b/filip/clients/base_http_client.py
@@ -58,7 +58,7 @@ def __init__(self,
     def __enter__(self):
         if not self.session:
             self.session = requests.Session()
-            self.headers.update(self.fiware_headers.dict(by_alias=True))
+            self.headers.update(self.fiware_headers.model_dump(by_alias=True))
             self._external_session = False
         return self
 
@@ -94,12 +94,12 @@ def fiware_headers(self, headers: Union[Dict, FiwareHeader]) -> None:
         if isinstance(headers, FiwareHeader):
             self._fiware_headers = headers
         elif isinstance(headers, dict):
-            self._fiware_headers = FiwareHeader.parse_obj(headers)
+            self._fiware_headers = FiwareHeader.model_validate(headers)
         elif isinstance(headers, str):
-            self._fiware_headers = FiwareHeader.parse_raw(headers)
+            self._fiware_headers = FiwareHeader.model_validate_json(headers)
         else:
             raise TypeError(f'Invalid headers! {type(headers)}')
-        self.headers.update(self.fiware_headers.dict(by_alias=True))
+        self.headers.update(self.fiware_headers.modul_dump(by_alias=True))
 
     @property
     def fiware_service(self) -> str:
@@ -121,7 +121,7 @@ def fiware_service(self, service: str) -> None:
             None
         """
         self._fiware_headers.service = service
-        self.headers.update(self.fiware_headers.dict(by_alias=True))
+        self.headers.update(self.fiware_headers.model_dump(by_alias=True))
 
     @property
     def fiware_service_path(self) -> str:
@@ -143,7 +143,7 @@ def fiware_service_path(self, service_path: str) -> None:
             None
         """
         self._fiware_headers.service_path = service_path
-        self.headers.update(self.fiware_headers.dict(by_alias=True))
+        self.headers.update(self.fiware_headers.model_dump(by_alias=True))
 
     @property
     def headers(self):

diff --git a/filip/models/base.py b/filip/models/base.py
@@ -70,6 +70,8 @@ class FiwareHeader(BaseModel):
     Context Brokers to support hierarchical scopes:
     https://fiware-orion.readthedocs.io/en/master/user/service_path/index.html
     """
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
+
     service: str = Field(
         alias="fiware-service",
         default="",
@@ -84,7 +86,7 @@ class FiwareHeader(BaseModel):
         max_length=51,
         pattern=r'^((\/\w*)|(\/\#))*(\,((\/\w*)|(\/\#)))*$'
     )
-    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
+
 
 
 class FiwareRegex(str, Enum):