chore: small fixes

Author: rokroskar

.devcontainer/devcontainer.json

@@ -33,7 +33,7 @@
         "version": "21",
         "jdkDistro": "open"
     },
-    "./solr": {}
+    // "./solr": {}
 	},
 	"overrideFeatureInstallOrder": [
 		"ghcr.io/devcontainers-extra/features/poetry",

components/renku_data_services/activitypub/blueprints.py

@@ -264,19 +264,22 @@ async def _webfinger(request: Request) -> JSONResponse:
     def host_meta(self) -> BlueprintFactoryResponse:
         """Host metadata endpoint."""
 
-        async def _host_meta(request: Request) -> HTTPResponse:
-            host_meta_xml = f"""<?xml version="1.0" encoding="UTF-8"?>
-<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-  <Link rel="lrdd" template="{self.config.base_url}/ap/webfinger?resource={{uri}}"/>
-</XRD>"""
-
+        async def _host_meta_handler(request: Request) -> HTTPResponse:
+            # Create the XML response
+            template = self.config.base_url + "/ap/webfinger?resource={uri}"
+            xml_content = '<?xml version="1.0" encoding="UTF-8"?>\n'
+            xml_content += '<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">\n'
+            xml_content += f'  <Link rel="lrdd" template="{template}"/>\n'
+            xml_content += '</XRD>'
+
+            # Return the response
             return text(
-                host_meta_xml,
+                xml_content,
                 status=200,
                 headers={"Content-Type": "application/xrd+xml"},
             )
 
-        return "/ap/.well-known/host-meta", ["GET"], _host_meta
+        return "/ap/.well-known/host-meta", ["GET"], _host_meta_handler
 
     def nodeinfo(self) -> BlueprintFactoryResponse:
         """NodeInfo endpoint."""

components/renku_data_services/activitypub/core.py

@@ -5,6 +5,7 @@
 from datetime import UTC, datetime
 from typing import Any, Dict, List, Optional, Union
 import urllib.parse
+import dataclasses
 
 import httpx
 from cryptography.hazmat.primitives.asymmetric import padding
@@ -227,7 +228,7 @@ async def _deliver_activity(
 
             if response.status_code >= 400:
                 logger.error(f"Failed to deliver activity to {inbox_url}: {response.status_code} {response.text}")
-                raise errors.ExternalServiceError(
+                raise errors.ProgrammingError(
                     message=f"Failed to deliver activity to {inbox_url}: {response.status_code}"
                 )
 
@@ -288,23 +289,22 @@ async def _build_signature_headers(
             "Accept": "application/activity+json",
         }
 
-    def _to_dict(self, obj: Any) -> Dict[str, Any]:
+    def _to_dict(self, obj: Any) -> Any:
         """Convert an object to a dictionary."""
         if isinstance(obj, dict):
             return {k: self._to_dict(v) for k, v in obj.items()}
         elif isinstance(obj, list):
             return [self._to_dict(item) for item in obj]
-        elif hasattr(obj, "__dataclass_fields__"):
-            # It's a dataclass
+        elif dataclasses.is_dataclass(obj) and not isinstance(obj, type):
+            # Convert dataclass instance to dict
             result = {}
-            for field_name in obj.__dataclass_fields__:
-                value = getattr(obj, field_name)
-                if value is not None:  # Skip None values
+            for field_name, field_value in dataclasses.asdict(obj).items():
+                if field_value is not None:  # Skip None values
                     if field_name == "context":
                         # Special case for @context
-                        result["@context"] = self._to_dict(value)
+                        result["@context"] = field_value
                     else:
-                        result[field_name] = self._to_dict(value)
+                        result[field_name] = field_value
             return result
         elif isinstance(obj, datetime):
             return obj.isoformat()