roboherd 0.1.3__tar.gz → 0.1.5__tar.gz

{roboherd-0.1.3 → roboherd-0.1.5}/.woodpecker/test.yml

@@ -2,21 +2,35 @@ when:
   - branch: [main]
     event: [pull_request, push]
 
+matrix:
+  extras: ["--all-extras", ""]
+
 steps:
   build:
     image: ghcr.io/astral-sh/uv:python3.11-alpine
     commands:
-      - uv sync --all-extras
+      - uv sync ${extras}
   test_format:
     image: ghcr.io/astral-sh/uv:python3.11-alpine
     commands:
-      - uv run ruff format .
+      - uv run ruff format --check .
       - uv run ruff check .
+    when:
+      - matrix: { extras: "--all-extras" }
   test_pytest:
     image: ghcr.io/astral-sh/uv:python3.11-alpine
     commands:
       - uv run pytest
+  test_typing:
+    image: ghcr.io/astral-sh/uv:python3.11-alpine
+    commands:
+      - apk add libstdc++ libgcc
+      - uv run pyright roboherd
+    when:
+      - matrix: { extras: "--all-extras" }
   build_docs:
     image: ghcr.io/astral-sh/uv:python3.11-alpine
     commands:
       - uv run mkdocs build
+    when:
+      - matrix: { extras: "--all-extras" }

{roboherd-0.1.3 → roboherd-0.1.5}/CHANGES.md

@@ -1,5 +1,20 @@
 # Changes to roboherd
 
+## 0.1.5 ([Milestone](https://codeberg.org/bovine/roboherd/milestone/10581))
+
+- Allow overriding the base_url [roboherd#12](https://codeberg.org/bovine/roboherd/issues/12)
+- Separate out the internal state of a RoboCow
+- If no preferredUsername is set and handle is updated, send Update Service [roboherd#33](https://codeberg.org/bovine/roboherd/issues/33)
+- Add an icon property [roboherd#10](https://codeberg.org/bovine/roboherd/issues/10)
+- Added a logo [roboherd#32](https://codeberg.org/bovine/roboherd/issues/32)
+- Add PublishActivity annotation [roboherd#30](https://codeberg.org/bovine/roboherd/issues/30)
+
+## 0.1.4 ([Milestone](https://codeberg.org/bovine/roboherd/milestone/10442))
+
+- Type check the project
+- No longer require bovine [roboherd#26](https://codeberg.org/bovine/roboherd/issues/26)
+- Fixed typo in Dockerfile [roboherd#28](https://codeberg.org/bovine/roboherd/issues/28)
+
 ## 0.1.3 ([Milestone](https://codeberg.org/bovine/roboherd/milestone/10441))
 
 - Add information about developement [roboherd#24](https://codeberg.org/bovine/roboherd/issues/24)

{roboherd-0.1.3 → roboherd-0.1.5}/PKG-INFO

@@ -1,8 +1,9 @@
 Metadata-Version: 2.4
 Name: roboherd
-Version: 0.1.3
+Version: 0.1.5
 Summary: A Fediverse bot framework
 Requires-Python: >=3.11
+Requires-Dist: aiohttp>=3.11.12
 Requires-Dist: almabtrieb[mqtt]>=0.1.0a1
 Requires-Dist: apscheduler>=3.11.0
 Requires-Dist: click>=8.1.8

{roboherd-0.1.3 → roboherd-0.1.5}/docs/index.md

@@ -93,8 +93,23 @@ Setting me as the author and the source code is contained in [meta_information][
 --8<-- "roboherd/examples/meta.py"
 ```
 
-!!! todo
-    How to configure a profile picture [roboherd#10](https://codeberg.org/bovine/roboherd/issues/10)
+By setting to `icon` property of [roboherd.cow.types.Information][], one can
+change the profile picture.
+
+### Config overrides
+
+By running
+
+```toml title="roboherd.toml"
+base_url = "https://dev.bovine.social"
+
+[cow.devnull]
+bot = "roboherd.examples.dev_null:bot"
+handle = "nothingness"
+```
+
+one would instead create a bot with the handle `acct:nothingness@dev.bovine.social`.
+Similarly, one can override the name and the `base_url` to use.
 
 ### Posting on startup
 
@@ -103,7 +118,8 @@ By adding
 ```python
 @bot.startup
 async def startup(publish_object: PublishObject, object_factory: ObjectFactory):
-    await publish_object(object_factory.note(content="Booo! 🐦").as_public().build())
+    note = object_factory.note(content="Booo! 🐦").as_public().build()
+    await publish_object(note)
 ```
 
 one can post on startup. Here  [PublishObject][roboherd.annotations.PublishObject]
@@ -119,6 +135,11 @@ ObjectFactory injects an [ObjectFactory][bovine.activitystreams.object_factory.O
     --8<-- "roboherd/examples/scarecrow.py"
     ```
 
+!!! hint
+    Similarly to PublishObject, one can use
+    [PublishActivity][roboherd.annotations.PublishActivity]
+    to post activities.
+
 ### Replying to messages
 
 By adding a block such as
@@ -322,3 +343,7 @@ version, have a [milestone](https://codeberg.org/bovine/roboherd/milestones)
 matching the new version, and appropriate entries in
 `CHANGES.md`. Then once a pull request with this is merged,
 the rest happens automatically.
+
+## Acknowledgements
+
+Logo via [Lorc](https://game-icons.net/1x1/lorc/bull-horns.html).

{roboherd-0.1.3 → roboherd-0.1.5}/mkdocs.yml

@@ -5,6 +5,8 @@ repo_url: https://codeberg.org/bovine/roboherd/
 repo_name: bovine/roboherd
 theme:
   name: material
+  logo: assets/bull-horns.png
+  favicon: assets/bull-horns.png
   icon:
     repo: fontawesome/brands/git-alt
   palette:

{roboherd-0.1.3 → roboherd-0.1.5}/pyproject.toml

@@ -1,10 +1,11 @@
 [project]
 name = "roboherd"
-version = "0.1.3"
+version = "0.1.5"
 description = "A Fediverse bot framework"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
+    "aiohttp>=3.11.12",
     "almabtrieb[mqtt]>=0.1.0a1",
     "apscheduler>=3.11.0",
     "click>=8.1.8",
@@ -37,6 +38,7 @@ dev-dependencies = [
     "griffe-fieldz>=0.2.1",
     "mkdocs-click>=0.8.1",
     "ruff>=0.9.6",
+    "pyright>=1.1.394",
 ]
 
 [tool.pytest.ini_options]

{roboherd-0.1.3 → roboherd-0.1.5}/resources/docker/Dockerfile

@@ -1,7 +1,7 @@
 FROM helgekr/bovine:0.5.18-python3.13
 
 ARG tag
-RUN pip install roboherd==#{tag}
+RUN pip install roboherd==${tag}
 
 RUN mkdir /app
 WORKDIR /app

{roboherd-0.1.3 → roboherd-0.1.5}/roboherd/__main__.py

@@ -10,6 +10,7 @@ from roboherd.herd import RoboHerd
 from roboherd.herd.manager import HerdManager
 from roboherd.util import create_connection
 from roboherd.register import register as run_register
+from roboherd.validators import validators
 
 logging.basicConfig(level=logging.INFO)
 
@@ -32,6 +33,7 @@ def main(ctx, connection_string, base_url, config_file):
     settings = dynaconf.Dynaconf(
         settings_files=[config_file],
         envvar_prefix="ROBOHERD",
+        validators=validators,
     )
     ctx.ensure_object(dict)
 
@@ -41,12 +43,12 @@ def main(ctx, connection_string, base_url, config_file):
     if connection_string:
         ctx.obj["connection_string"] = connection_string
     else:
-        ctx.obj["connection_string"] = settings.get("connection_string")
+        ctx.obj["connection_string"] = settings.connection_string
 
     if base_url:
         ctx.obj["base_url"] = base_url
     else:
-        ctx.obj["base_url"] = settings.get("base_url")
+        ctx.obj["base_url"] = settings.base_url
 
 
 @main.command()

{roboherd-0.1.3 → roboherd-0.1.5}/roboherd/annotations/__init__.py

@@ -5,11 +5,11 @@ from almabtrieb import Almabtrieb
 
 
 def get_raw(data: dict) -> dict:
-    return data.get("data").get("raw")
+    return data.get("data", {}).get("raw")
 
 
 def get_parsed(data: dict) -> dict:
-    result = data.get("data").get("parsed")
+    result = data.get("data", {}).get("parsed")
     if result is None:
         raise ValueError("No parsed data found")
     return result
@@ -23,11 +23,17 @@ ParsedData = Annotated[dict, Depends(get_parsed)]
 
 
 def get_activity(parsed: ParsedData) -> dict:
-    return parsed.get("activity")
+    result = parsed.get("activity")
+    if not result:
+        raise ValueError("No activity found")
+    return result
 
 
 def get_embedded_object(parsed: ParsedData) -> dict:
-    return parsed.get("embeddedObject")
+    result = parsed.get("embeddedObject")
+    if not result:
+        raise ValueError("No embedded object found")
+    return result
 
 
 Activity = Annotated[dict, Depends(get_activity)]
@@ -37,6 +43,7 @@ EmbeddedObject = Annotated[dict, Depends(get_embedded_object)]
 """The embedded object in the activity as parsed by muck_out"""
 
 Publisher = Callable[[dict], Awaitable[None]]
+"""Type returned by the publishing functions"""
 
 
 def construct_publish_object(connection: Almabtrieb, actor_id: str) -> Publisher:
@@ -46,5 +53,16 @@ def construct_publish_object(connection: Almabtrieb, actor_id: str) -> Publisher
     return publish
 
 
+def construct_publish_activity(connection: Almabtrieb, actor_id: str) -> Publisher:
+    async def publish(data: dict):
+        await connection.trigger("publish_activity", {"actor": actor_id, "data": data})
+
+    return publish
+
+
 PublishObject = Annotated[Publisher, Depends(construct_publish_object)]
 """Allows one to publish an object as the actor. Assumes cattle_grid has the extension `simple_object_storage` or equivalent"""
+
+
+PublishActivity = Annotated[Publisher, Depends(construct_publish_activity)]
+"""Allows one to publish an activity as the actor. Assumes cattle_grid has the extension `simple_object_storage` or equivalent"""

{roboherd-0.1.3 → roboherd-0.1.5}/roboherd/annotations/bovine.py

@@ -7,19 +7,19 @@ from .common import Profile
 try:
     from bovine.activitystreams import factories_for_actor_object
     from bovine.activitystreams.activity_factory import (
-        ActivityFactory as BovineActivityFactory,
+        ActivityFactory as BovineActivityFactory,  # type: ignore
     )
     from bovine.activitystreams.object_factory import (
-        ObjectFactory as BovineObjectFactory,
+        ObjectFactory as BovineObjectFactory,  # type: ignore
     )
 
-    def get_activity_factory(profile: Profile) -> BovineActivityFactory:
+    def get_activity_factory(profile: Profile) -> BovineActivityFactory:  # type: ignore
         activity_factory, _ = factories_for_actor_object(profile)
-        return activity_factory
+        return activity_factory  # type: ignore
 
-    def get_object_factory(profile: Profile) -> BovineObjectFactory:
+    def get_object_factory(profile: Profile) -> BovineObjectFactory:  # type: ignore
         _, object_factory = factories_for_actor_object(profile)
-        return object_factory
+        return object_factory  # type: ignore
 
 except ImportError:
 
@@ -34,8 +34,8 @@ except ImportError:
         raise ImportError("bovine not installed")
 
 
-ActivityFactory = Annotated[BovineActivityFactory, Depends(get_activity_factory)]
+ActivityFactory = Annotated[BovineActivityFactory, Depends(get_activity_factory)]  # type: ignore
 """The activity factory of type [bovine.activitystreams.activity_factory.ActivityFactory][]"""
 
-ObjectFactory = Annotated[BovineObjectFactory, Depends(get_object_factory)]
+ObjectFactory = Annotated[BovineObjectFactory, Depends(get_object_factory)]  # type: ignore
 """The object factory of type [bovine.activitystreams.object_factory.ObjectFactory][]"""

{roboherd-0.1.3 → roboherd-0.1.5}/roboherd/annotations/common.py

@@ -5,7 +5,9 @@ from roboherd.cow import RoboCow
 
 
 def get_profile(cow: RoboCow) -> dict:
-    return cow.profile
+    if cow.internals.profile is None:
+        raise ValueError("Cow has no profile")
+    return cow.internals.profile
 
 
 Profile = Annotated[dict, Depends(get_profile)]

{roboherd-0.1.3 → roboherd-0.1.5}/roboherd/cow/__init__.py

@@ -25,17 +25,8 @@ class CronEntry:
 
 
 @dataclass
-class RoboCow:
-    information: Information = field(
-        metadata=dict(description="Information about the cow")
-    )
-
-    auto_follow: bool = field(
-        default=True,
-        metadata=dict(
-            description="""Whether to automatically accept follow requests"""
-        ),
-    )
+class RoboCowInternals:
+    """Internal data for the cow"""
 
     profile: dict | None = field(
         default=None,
@@ -69,6 +60,27 @@ class RoboCow:
 
     startup_routine: Callable | None = None
 
+    base_url: str | None = field(default=None)
+
+
+@dataclass
+class RoboCow:
+    information: Information = field(
+        metadata=dict(description="Information about the cow")
+    )
+
+    auto_follow: bool = field(
+        default=True,
+        metadata=dict(
+            description="""Whether to automatically accept follow requests"""
+        ),
+    )
+
+    internals: RoboCowInternals = field(
+        default_factory=RoboCowInternals,
+        metadata=dict(description="Internal data for the cow"),
+    )
+
     def action(self, action: str = "*", activity_type: str = "*"):
         """Adds a handler for an event. Use "*" as a wildcard.
 
@@ -90,15 +102,15 @@ class RoboCow:
 
         def inner(func):
             config.func = func
-            self.handlers.add_handler(config, func)
-            self.handler_configuration.append(config)
+            self.internals.handlers.add_handler(config, func)
+            self.internals.handler_configuration.append(config)
             return func
 
         return inner
 
     def cron(self, crontab):
         def inner(func):
-            self.cron_entries.append(CronEntry(crontab, func))
+            self.internals.cron_entries.append(CronEntry(crontab, func))
 
             return func
 
@@ -119,7 +131,7 @@ class RoboCow:
             action="incoming",
             activity_type="*",
         )
-        self.handlers.add_handler(config, func)
+        self.internals.handlers.add_handler(config, func)
         return func
 
     def incoming_create(self, func):
@@ -137,75 +149,57 @@ class RoboCow:
         config = HandlerConfiguration(
             action="incoming", activity_type="Create", func=func
         )
-        self.handler_configuration.append(config)
-        self.handlers.add_handler(config, func)
+        self.internals.handler_configuration.append(config)
+        self.internals.handlers.add_handler(config, func)
         return func
 
     def startup(self, func):
         """Adds a startup routine to be run when the cow is started."""
 
-        self.startup_routine = func
+        self.internals.startup_routine = func
 
     def needs_update(self):
         """Checks if the cow needs to be updated"""
-        if self.profile is None:
+        if self.internals.profile is None:
             return True
 
-        if self.information.name != self.profile.get("name"):
+        if self.information.name != self.internals.profile.get("name"):
             return True
 
-        if self.information.description != self.profile.get("summary"):
+        if self.information.description != self.internals.profile.get("summary"):
             return True
 
         return False
 
-    def update_data(self):
-        """
-        Returns the update_actor message to send to cattle_grid
-
-        ```pycon
-        >>> info = Information(handle="moocow", name="name", description="description")
-        >>> cow = RoboCow(information=info, actor_id="http://host.example/actor/1")
-        >>> cow.update_data()
-        {'actor': 'http://host.example/actor/1',
-            'profile': {'name': 'name',
-                'summary': 'description'},
-            'automaticallyUpdateFollowers': True}
-
-        ```
-        """
-        return {
-            "actor": self.actor_id,
-            "profile": {
-                "name": self.information.name,
-                "summary": self.information.description,
-            },
-            "automaticallyUpdateFollowers": self.auto_follow,
-        }
-
     async def run_startup(self, connection: Almabtrieb):
         """Runs when the cow is birthed"""
 
-        if self.profile is None:
-            result = await connection.fetch(self.actor_id, self.actor_id)
-            self.profile = result.data
+        if self.internals.profile is None:
+            if not self.internals.actor_id:
+                raise ValueError("Actor ID is not set")
+            result = await connection.fetch(
+                self.internals.actor_id, self.internals.actor_id
+            )
+            if not result.data:
+                raise ValueError("Could not retrieve profile")
+            self.internals.profile = result.data
 
-        if self.cron_entries:
+        if self.internals.cron_entries:
             frequency = ", ".join(
-                get_description(entry.crontab) for entry in self.cron_entries
+                get_description(entry.crontab) for entry in self.internals.cron_entries
             )
             self.information.frequency = frequency
 
-        update = determine_profile_update(self.information, self.profile)
+        update = determine_profile_update(self.information, self.internals.profile)
 
         if update:
             logger.info("Updating profile for %s", self.information.handle)
 
             await connection.trigger("update_actor", update)
 
-        if self.startup_routine:
-            await inject(self.startup_routine)(
-                cow=self,
-                connection=connection,
-                actor_id=self.actor_id,
-            )
+        if self.internals.startup_routine:
+            await inject(self.internals.startup_routine)(
+                cow=self,  # type:ignore
+                connection=connection,  # type:ignore
+                actor_id=self.internals.actor_id,  # type:ignore
+            )  # type:ignore

roboherd-0.1.5/roboherd/cow/const.py

@@ -0,0 +1,6 @@
+default_icon = {
+    "mediaType": "image/png",
+    "type": "Image",
+    "url": "https://dev.bovine.social/assets/bull-horns.png",
+}
+"""The default icon to be used"""

{roboherd-0.1.3 → roboherd-0.1.5}/roboherd/cow/profile.py

@@ -1,5 +1,15 @@
 from urllib.parse import urlparse
-from bovine.activitystreams.utils import as_list
+
+try:
+    from bovine.activitystreams.utils import as_list
+except ImportError:
+
+    def as_list(value):
+        if isinstance(value, list):
+            return value
+
+        return [value]
+
 
 from .types import Information
 
@@ -14,6 +24,9 @@ def profile_part_needs_update(information: Information, profile: dict) -> bool:
     if information.type != profile.get("type"):
         return True
 
+    if information.icon != profile.get("icon"):
+        return True
+
     return False
 
 
@@ -27,7 +40,7 @@ def key_index_from_attachment(attachments: list[dict], key: str) -> int | None:
 
 
 def determine_action_for_key_and_value(
-    attachments: list[dict], key: str, value: str
+    attachments: list[dict], key: str, value: str | None
 ) -> dict | None:
     idx = key_index_from_attachment(attachments, key)
     if idx is None:
@@ -78,19 +91,19 @@ def determine_actions(information: Information, profile: dict) -> list[dict] | N
                 "identifier": "acct:"
                 + information.handle
                 + "@"
-                + urlparse(profile.get("id")).netloc,
+                + str(urlparse(profile.get("id")).netloc),
                 "primary": True,
             }
         )
 
-    actions = list(filter(lambda x: x, actions))
+    actions = [x for x in actions if x is not None]
 
     if len(actions) == 0:
         return None
     return actions
 
 
-def determine_profile_update(information: Information, profile: dict) -> dict:
+def determine_profile_update(information: Information, profile: dict) -> dict | None:
     """Returns the update for the profile"""
 
     update = {"actor": profile.get("id")}
@@ -100,6 +113,7 @@ def determine_profile_update(information: Information, profile: dict) -> dict:
             "type": information.type,
             "name": information.name,
             "summary": information.description,
+            "icon": information.icon,
         }
 
     actions = determine_actions(information, profile)

{roboherd-0.1.3 → roboherd-0.1.5}/roboherd/cow/test_init.py

@@ -27,7 +27,8 @@ def test_needs_update(name, summary, profile, expected):
         name=name,
         description=summary,
     )
-    cow = RoboCow(information=info, profile=profile)
+    cow = RoboCow(information=info)
+    cow.internals.profile = profile
 
     assert cow.needs_update() == expected
 
@@ -40,13 +41,13 @@ def test_cron():
     async def test_func():
         pass
 
-    assert len(cow.cron_entries) == 1
+    assert len(cow.internals.cron_entries) == 1
 
 
 async def test_startup():
     info = Information(handle="testcow")
     cow = RoboCow(information=info)
-    cow.profile = {"id": "http://host.test/actor/cow"}
+    cow.internals.profile = {"id": "http://host.test/actor/cow"}
     mock = AsyncMock()
 
     cow.startup(mock)

{roboherd-0.1.3 → roboherd-0.1.5}/roboherd/cow/test_profile.py

@@ -1,7 +1,7 @@
 import pytest
 
 from .types import Information, MetaInformation
-
+from .const import default_icon
 from .profile import determine_profile_update
 
 
@@ -14,6 +14,7 @@ from .profile import determine_profile_update
     ],
 )
 def test_determine_profile_update_no_update(info_params, profile):
+    profile["icon"] = default_icon
     info = Information(**info_params)
 
     assert determine_profile_update(info, profile) is None
@@ -27,13 +28,22 @@ def test_determine_profile_update():
 
     assert result == {
         "actor": "http://host.test/actor/1",
-        "profile": {"type": "Service", "name": "name", "summary": "description"},
+        "profile": {
+            "type": "Service",
+            "name": "name",
+            "summary": "description",
+            "icon": default_icon,
+        },
     }
 
 
 def test_determine_profile_update_author():
     info = Information(meta_information=MetaInformation(author="acct:author@host.test"))
-    profile = {"id": "http://host.test/actor/1", "type": "Service"}
+    profile = {
+        "id": "http://host.test/actor/1",
+        "type": "Service",
+        "icon": default_icon,
+    }
 
     result = determine_profile_update(info, profile)
 
@@ -47,3 +57,25 @@ def test_determine_profile_update_author():
             }
         ],
     }
+
+
+def test_profile_update_for_new_preferredUsername():
+    info = Information(handle="handle")
+    profile = {
+        "id": "http://host.test/actor/1",
+        "type": "Service",
+        "icon": default_icon,
+    }
+
+    result = determine_profile_update(info, profile)
+
+    assert result == {
+        "actor": "http://host.test/actor/1",
+        "actions": [
+            {
+                "action": "add_identifier",
+                "identifier": "acct:handle@host.test",
+                "primary": True,
+            }
+        ],
+    }