chore: simplify the orm part

Author: rokroskar

components/renku_data_services/activitypub/core.py

@@ -501,7 +501,8 @@ async def _discover_inbox_url(self, actor_uri: str) -> Optional[str]:
                     return None
 
                 logger.info(f"Discovered inbox URL: {inbox_url}")
-                return inbox_url
+                # Ensure we're returning a string, not Any
+                return str(inbox_url) if inbox_url else None
 
         except Exception as e:
             logger.exception(f"Error discovering inbox URL: {e}")

components/renku_data_services/activitypub/db.py

@@ -259,14 +259,14 @@ async def add_follower(
 
         # Create the follower using the ORM
         logger.info(f"Creating new follower record for {follower.follower_actor_uri}")
+
         follower_orm = orm.ActivityPubFollowerORM(
-            actor_id=actor_orm.id,
+            actor_id=follower.actor_id,
             follower_actor_uri=follower.follower_actor_uri,
             accepted=follower.accepted,
             actor=actor_orm
         )
 
-        await session.refresh(actor_orm)
         session.add(follower_orm)
         await session.flush()
         await session.refresh(follower_orm)

components/renku_data_services/activitypub/orm.py

@@ -55,12 +55,10 @@ class ActivityPubActorORM(BaseORM):
 
     # Relationships
     followers: Mapped[list["ActivityPubFollowerORM"]] = relationship(
-        "ActivityPubFollowerORM",
         primaryjoin="ActivityPubActorORM.id == ActivityPubFollowerORM.actor_id",
         back_populates="actor",
         cascade="all, delete-orphan",
         lazy="selectin",
-        repr=False,
         default_factory=list,
     )
 
@@ -107,11 +105,9 @@ class ActivityPubFollowerORM(BaseORM):
 
     # Relationships
     actor: Mapped[ActivityPubActorORM] = relationship(
-        ActivityPubActorORM,
         primaryjoin="ActivityPubActorORM.id == ActivityPubFollowerORM.actor_id",
         back_populates="followers",
         lazy="selectin",
-        repr=False,
         default=None,
     )