add logging message and change field order in dsms config

Author: MBueschelberger

dsms/core/configuration.py

@@ -49,22 +49,6 @@ class Configuration(BaseSettings):
     host_url: AnyUrl = Field(
         ..., description="Url of the DSMS instance to connect."
     )
-    request_timeout: int = Field(
-        120,
-        description="Timeout in seconds until the request to the DSMS is timed out.",
-    )
-
-    ssl_verify: bool = Field(
-        True,
-        description="Whether the SSL of the DSMS shall be verified during connection.",
-    )
-
-    strict_validation: bool = Field(
-        True,
-        description="""Whether the validation of custom properties shall be strict.
-        Disabling this might be helpful when e.g. the schema of a KType has been changed
-        and the custom properties are not compatible anymore and should be updated accordingly.""",
-    )
 
     username: Optional[SecretStr] = Field(
         None,
@@ -102,17 +86,28 @@ class Configuration(BaseSettings):
         validation_alias=AliasChoices("DSMS_REALM", "KEYCLOAK_REALM_NAME"),
     )
 
-    loglevel: Optional[Union[Loglevel, str]] = Field(
-        None,
-        description="Set level of logging messages",
-        alias=AliasChoices("loglevel", "log_level"),
-    )
-
     token: Optional[SecretStr] = Field(
         None,
         description="JWT bearer token for connecting to the DSMS instance",
     )
 
+    request_timeout: int = Field(
+        120,
+        description="Timeout in seconds until the request to the DSMS is timed out.",
+    )
+
+    ssl_verify: bool = Field(
+        True,
+        description="Whether the SSL of the DSMS shall be verified during connection.",
+    )
+
+    strict_validation: bool = Field(
+        True,
+        description="""Whether the validation of custom properties shall be strict.
+        Disabling this might be helpful when e.g. the schema of a KType has been changed
+        and the custom properties are not compatible anymore and should be updated accordingly.""",
+    )
+
     enable_auto_reauth: bool = Field(
         True,
         description="""Whether to automatically reauthenticate with username and password
@@ -178,6 +173,12 @@ class Configuration(BaseSettings):
         description="Repository of the triplestore for KItems in the DSMS",
     )
 
+    loglevel: Optional[Union[Loglevel, str]] = Field(
+        None,
+        description="Set level of logging messages",
+        alias=AliasChoices("loglevel", "log_level"),
+    )
+
     qudt_units: AnyUrl = Field(
         "http://qudt.org/2.1/vocab/unit",
         description="URI to QUDT Unit ontology for unit conversion",

dsms/core/utils.py

@@ -70,6 +70,7 @@ def _perform_request(
         and dsms.config.enable_auto_reauth
         and retry
     ):
+        logger.info("Token expired. Will re-authenticate.")
         dsms.config = dsms.config.model_validate(dsms.config)
         response = _perform_request(
             dsms, route, method, retry=False, headers=None, **kwargs