Merge branch 'dev'

Author: simontaurus

src/osw/core.py

@@ -1624,10 +1624,11 @@ def store_entity(
         param:
             StoreEntityParam, the dataclass instance or a list of instances
         """
-        if isinstance(param, model.Entity):
-            param = OSW.StoreEntityParam(entities=[param])
         if isinstance(param, list):
             param = OSW.StoreEntityParam(entities=param)
+        elif not isinstance(param, OSW.StoreEntityParam):
+            # Accept any OswBaseModel / Entity / Controller instance
+            param = OSW.StoreEntityParam(entities=[param])
         if not isinstance(param.entities, list):
             param.entities = [param.entities]
 

src/osw/utils/workflow.py

@@ -245,7 +245,14 @@ async def handle_async_request(self, request: httpx.Request) -> httpx.Response:
             rewritten = self._rewrite_request(request)
             response = await httpx.AsyncHTTPTransport().handle_async_request(rewritten)
             if response.status_code == 403 and self._relogin_cb:
-                log.warning("ApiGateway session expired, re-authenticating")
+                try:
+                    body = response.read().decode(errors="replace")
+                except Exception:
+                    body = "<unreadable>"
+                log.warning(
+                    "ApiGateway returned 403, re-authenticating. " "Response: %s",
+                    body,
+                )
                 self._relogin_cb()
                 self._csrf_token = None
                 rewritten = self._rewrite_request(request)

src/osw/wtsite.py

@@ -92,7 +92,11 @@ def __init__(self, config: Union[WtSiteConfig, WtSiteLegacyConfig]):
 
         if isinstance(config, WtSite.WtSiteLegacyConfig):
             self._site: mwclient.Site = config.site
+            self._cred_mngr = None
+            self._iri = None
         else:
+            self._cred_mngr = config.cred_mngr
+            self._iri = config.iri
             cred = config.cred_mngr.get_credential(
                 CredentialManager.CredentialConfig(
                     iri=config.iri, fallback=CredentialManager.CredentialFallback.ask