iembot 0.3.0__tar.gz → 0.3.1__tar.gz

{iembot-0.3.0 → iembot-0.3.1}/.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        PYTHON_VERSION: ["3.10", "3.13", "3.14"]
+        PYTHON_VERSION: ["3.11", "3.13", "3.14"]
     env:
       PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
     steps:

{iembot-0.3.0 → iembot-0.3.1}/CHANGELOG.md

@@ -3,14 +3,18 @@
 
 All notable changes to this library are documented in this file.
 
-## Unreleased Version
+## **0.3.1** (4 Feb 2026)
 
 ### API Changes
 
+- Replace `txyam2` dependency with `pymemcache` called from a thread (#140).
+
 ### New Features
 
 ### Bug Fixes
 
+- Correct slack subscription logic when a new channel is joined (#136).
+
 ## **0.3.0** (4 Feb 2026)
 
 First sane release of this code base onto pypi and hopefully conda-forge.

{iembot-0.3.0 → iembot-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iembot
-Version: 0.3.0
+Version: 0.3.1
 Summary: A poorly written XMPP bot that does other things
 Author-email: daryl herzmann <akrherz@gmail.com>
 License: Apache
@@ -20,11 +20,11 @@ Requires-Dist: httpx
 Requires-Dist: mastodon-py
 Requires-Dist: psycopg
 Requires-Dist: pyiem>=1.26
+Requires-Dist: pymemcache
 Requires-Dist: python-twitter
 Requires-Dist: requests
 Requires-Dist: service-identity
 Requires-Dist: twisted>=18.4
-Requires-Dist: txyam2
 Provides-Extra: dev
 Requires-Dist: cartopy; extra == "dev"
 Requires-Dist: codecov; extra == "dev"
@@ -41,7 +41,7 @@ Dynamic: license-file
 [![Code Health](https://landscape.io/github/akrherz/iembot/master/landscape.svg?style=flat)](https://landscape.io/github/akrherz/iembot/master)
 
 I am a XMPP client with limited bot capabilities.  In general, I am a message
-router more than anything.
+router more than anything.  Currently requires python 3.11+.
 
 ## Run iembot in development
 

{iembot-0.3.0 → iembot-0.3.1}/README.md

@@ -5,7 +5,7 @@
 [![Code Health](https://landscape.io/github/akrherz/iembot/master/landscape.svg?style=flat)](https://landscape.io/github/akrherz/iembot/master)
 
 I am a XMPP client with limited bot capabilities.  In general, I am a message
-router more than anything.
+router more than anything.  Currently requires python 3.11+.
 
 ## Run iembot in development
 

{iembot-0.3.0 → iembot-0.3.1}/environment.yml

@@ -7,9 +7,11 @@ dependencies:
  - twisted>=18.4.0
  - psycopg
  - pyiem>=1.26
+ - pymemcache
  - pytest
  - pytest-cov
  - pytest-runner
+ - pytest-twisted
  # bot non-async twitter
  - python-twitter
  - service_identity

iembot-0.3.1/pip_requirements.txt

@@ -0,0 +1,4 @@
+# generates RSS
+feedgen
+# memcached client
+pymemcache

{iembot-0.3.0 → iembot-0.3.1}/pyproject.toml

@@ -28,11 +28,11 @@ dependencies = [
   "mastodon-py",
   "psycopg",
   "pyiem>=1.26",
+  "pymemcache",
   "python-twitter",
   "requests",
   "service-identity",
   "twisted>=18.4",
-  "txyam2",
 ]
 
 optional-dependencies.dev = [
@@ -57,7 +57,7 @@ include-package-data = true
 version_scheme = "post-release"
 
 [tool.ruff]
-target-version = "py310"
+target-version = "py311"
 
 line-length = 79
 lint.select = [

{iembot-0.3.0 → iembot-0.3.1}/src/iembot/main.py

@@ -18,10 +18,10 @@ from twisted.internet import reactor
 from twisted.python import log
 from twisted.python.logfile import DailyLogFile
 from twisted.web import server
-from txyam.client import YamClient
 
 from iembot import webservices
 from iembot.bot import JabberClient
+from iembot.memcache import build_memcache_client
 from iembot.msghandlers import register_handler
 
 
@@ -43,10 +43,8 @@ def _build_dbpool(config: dict) -> adbapi.ConnectionPool:
     )
 
 
-def _build_memcache_client(memcache: str) -> YamClient:
-    client = YamClient(reactor, [memcache])
-    client.connect()
-    return client
+def _build_memcache_client(memcache: str):
+    return build_memcache_client(memcache)
 
 
 def _start_logging(logfile: str | None) -> None:

iembot-0.3.1/src/iembot/memcache.py

@@ -0,0 +1,45 @@
+"""Memcache client helpers."""
+
+from __future__ import annotations
+
+from pymemcache.client.base import Client as MemcacheClient
+from twisted.internet import threads
+
+
+def parse_memcache_addr(memcache: str) -> tuple[str, int]:
+    """."""
+    memcache = memcache.removeprefix("tcp:")
+    host = memcache
+    port = 11211
+    if ":" in memcache:
+        host, port_str = memcache.rsplit(":", 1)
+        try:
+            port = int(port_str)
+        except ValueError:
+            host = memcache
+    if not host:
+        host = "localhost"
+    return host, port
+
+
+class ThreadedMemcacheClient:
+    def __init__(self, host: str, port: int) -> None:
+        self._client = MemcacheClient((host, port))
+
+    def get(self, key: bytes):
+        def _get():
+            data = self._client.get(key)
+            return (0, data)
+
+        return threads.deferToThread(_get)
+
+    def disconnect(self) -> None:
+        try:
+            self._client.close()
+        except Exception:
+            pass
+
+
+def build_memcache_client(memcache: str) -> ThreadedMemcacheClient:
+    host, port = parse_memcache_addr(memcache)
+    return ThreadedMemcacheClient(host, port)

{iembot-0.3.0 → iembot-0.3.1}/src/iembot/slack.py

@@ -91,22 +91,51 @@ class SlackSubscribeChannel(resource.Resource):
     def store_slack_subscription(
         self,
         txn,
-        team_id,
-        channel_id,
-        subkey,
+        team_id: str,
+        channel_id: str,
+        subkey: str,
     ):
         """write to database."""
+        log.msg(
+            f"Handing slack subscription for T:`{team_id}` TC:`{channel_id}` "
+            f"C:`{subkey}`"
+        )
+        # Step 1, ensure that the slack channel exists
+        txn.execute(
+            """
+    select iembot_account_id from iembot_slack_team_channels
+    where team_id = %s and channel_id = %s
+            """,
+            (team_id, channel_id),
+        )
+        res = txn.fetchall()
+        if not res:
+            log.msg(
+                f"Slack Team: {team_id} Channel: {channel_id} does not exist "
+                "creating..."
+            )
+            txn.execute(
+                """
+                insert into iembot_slack_team_channels
+                (iembot_account_id, team_id, channel_id)
+                values (
+                    (select create_iembot_account('slack')), %s, %s)
+                returning iembot_account_id
+                """,
+                (team_id, channel_id),
+            )
+            res = txn.fetchall()
+        iembot_account_id = res[0]["iembot_account_id"]
         txn.execute(
             """
             insert into iembot_subscriptions(iembot_account_id, channel_id)
             values (
-                (select iembot_account_id from iembot_slack_team_channels
-                 where team_id = %s and channel_id = %s),
+                %s,
                 (select get_or_create_iembot_channel_id(%s))
             )
             on conflict do nothing
             """,
-            (team_id, channel_id, subkey),
+            (iembot_account_id, subkey),
         )
 
     def render(self, request):
@@ -120,11 +149,14 @@ class SlackSubscribeChannel(resource.Resource):
             channel_id,
             subkey,
         )
+        defer.addErrback(
+            lambda _: request.write(b"Error processing subscription")
+        )
         defer.addCallback(
             lambda _: request.write(f"Subscribed to {subkey}".encode("ascii"))
         )
-        defer.addCallback(lambda _: request.finish())
-        defer.addCallback(self.iembot.load_slack)
+        defer.addBoth(lambda _: request.finish())
+        defer.addCallback(lambda _: self.iembot.load_slack())
 
         return NOT_DONE_YET
 
@@ -173,7 +205,7 @@ class SlackUnsubscribeChannel(resource.Resource):
             )
         )
         defer.addCallback(lambda _: request.finish())
-        defer.addCallback(self.iembot.load_slack)
+        defer.addCallback(lambda _: self.iembot.load_slack())
 
         return NOT_DONE_YET
 
@@ -249,7 +281,7 @@ class SlackOauthChannel(resource.Resource):
             self.do_request_in_thread, data
         )
         defer.addCallback(self._cb_oauth, request)
-        defer.addCallback(self.iembot.load_slack)
+        defer.addCallback(lambda _: self.iembot.load_slack())
         defer.addErrback(self._eb_oauth, request)
         return NOT_DONE_YET
 

{iembot-0.3.0 → iembot-0.3.1}/src/iembot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iembot
-Version: 0.3.0
+Version: 0.3.1
 Summary: A poorly written XMPP bot that does other things
 Author-email: daryl herzmann <akrherz@gmail.com>
 License: Apache
@@ -20,11 +20,11 @@ Requires-Dist: httpx
 Requires-Dist: mastodon-py
 Requires-Dist: psycopg
 Requires-Dist: pyiem>=1.26
+Requires-Dist: pymemcache
 Requires-Dist: python-twitter
 Requires-Dist: requests
 Requires-Dist: service-identity
 Requires-Dist: twisted>=18.4
-Requires-Dist: txyam2
 Provides-Extra: dev
 Requires-Dist: cartopy; extra == "dev"
 Requires-Dist: codecov; extra == "dev"
@@ -41,7 +41,7 @@ Dynamic: license-file
 [![Code Health](https://landscape.io/github/akrherz/iembot/master/landscape.svg?style=flat)](https://landscape.io/github/akrherz/iembot/master)
 
 I am a XMPP client with limited bot capabilities.  In general, I am a message
-router more than anything.
+router more than anything.  Currently requires python 3.11+.
 
 ## Run iembot in development
 

{iembot-0.3.0 → iembot-0.3.1}/src/iembot.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ src/iembot/atmosphere.py
 src/iembot/bot.py
 src/iembot/main.py
 src/iembot/mastodon.py
+src/iembot/memcache.py
 src/iembot/msghandlers.py
 src/iembot/slack.py
 src/iembot/twitter.py

{iembot-0.3.0 → iembot-0.3.1}/src/iembot.egg-info/requires.txt

@@ -5,11 +5,11 @@ httpx
 mastodon-py
 psycopg
 pyiem>=1.26
+pymemcache
 python-twitter
 requests
 service-identity
 twisted>=18.4
-txyam2
 
 [dev]
 cartopy

{iembot-0.3.0 → iembot-0.3.1}/tests/test_main.py

@@ -80,13 +80,9 @@ def test_build_dbpool(monkeypatch):
     assert main_mod._build_dbpool(settings) is fakepool
 
 
-def test_build_memcache_client(monkeypatch):
-    fake = mock.Mock()
-    monkeypatch.setattr(main_mod, "YamClient", lambda _reactor, _addrs: fake)
-    fake.connect = mock.Mock()
+def test_build_memcache_client():
     result = main_mod._build_memcache_client("tcp:foo:1234")
-    assert result is fake
-    fake.connect.assert_called_once()
+    assert result
 
 
 def test_fatal_stops_reactor(monkeypatch):

{iembot-0.3.0 → iembot-0.3.1}/tests/test_slack.py

@@ -3,6 +3,9 @@
 from unittest import mock
 
 import pytest
+from twisted.internet import defer
+from twisted.web.server import NOT_DONE_YET
+from twisted.web.test.requesthelper import DummyRequest
 
 from iembot.slack import (
     SlackInstallChannel,
@@ -14,6 +17,32 @@ from iembot.slack import (
 from iembot.types import JabberClient
 
 
+@defer.inlineCallbacks
+def test_subscribe_channel_render(bot: JabberClient):
+    """Test that we can run the render workflow."""
+    ss = SlackSubscribeChannel(bot)
+    request = DummyRequest([])
+    request.args = {
+        b"team_id": [b"T12345"],
+        b"channel_id": [b"C67890"],
+        b"text": [b"AFDDMX"],
+    }
+    bot.dbpool.runInteraction = mock.Mock(return_value=defer.succeed(None))
+    result = ss.render(request)
+    assert result == NOT_DONE_YET
+    yield defer.succeed(None)
+    assert b"Subscribed" in b"".join(request.written)
+
+
+def test_install_channel_render(bot: JabberClient):
+    """See if we can render the install channel."""
+    ss = SlackInstallChannel(bot)
+    request = DummyRequest([b""])
+    result = ss.render(request)
+    assert result is not None
+    assert request.responseCode == 302
+
+
 @pytest.mark.parametrize("database", ["iembot"])
 def test_subscribe_channel(dbcursor, bot):
     """See if we can subscribe?"""
@@ -26,6 +55,18 @@ def test_subscribe_channel(dbcursor, bot):
     )
 
 
+@pytest.mark.parametrize("database", ["iembot"])
+def test_gh136_slack_first_channel_subscription(dbcursor, bot):
+    """See if subscribe works when we need to create a slack channel."""
+    ss = SlackSubscribeChannel(bot)
+    ss.store_slack_subscription(
+        dbcursor,
+        "TSS",  # needs to exist in iembot_slack_teams
+        "CSD2",  # new channel on slack unknown to the bot so far
+        "AFDDMX",
+    )
+
+
 @pytest.mark.parametrize("database", ["iembot"])
 def test_load_from_db(dbcursor, bot: JabberClient):
     """Exercise."""

iembot-0.3.0/pip_requirements.txt

@@ -1,4 +0,0 @@
-# generates RSS
-feedgen
-# twisted memcached
-txyam2