proscenium 0.0.11__py3-none-any.whl → 0.0.13__py3-none-any.whl

proscenium/admin/__init__.py

@@ -24,9 +24,12 @@ def props(console: Optional[Console]) -> List[Prop]:
 
 class Admin(Character):
 
-    def __init__(self, admin_channel_id: str):
-        super().__init__(admin_channel_id)
-        self.admin_channel_id = admin_channel_id
+    def __init__(self, channel_id: str, channel: str):
+        super().__init__(channel_id)
+        self.channel_id = channel_id
+        self.channel = channel
+
+        log.info("Admin handler started %s %s.", self.channel, self.channel_id)
 
     def wants_to_handle(self, channel_id: str, speaker_id: str, utterance: str) -> bool:
         return False

proscenium/bin/bot.py

@@ -1,15 +1,16 @@
 #!/usr/bin/env python3
 
+import typer
+import time
 import os
 import sys
 import logging
-import typer
 from pathlib import Path
 from rich.console import Console
 
 from proscenium.verbs.display import header
 from proscenium.bin import production_from_config
-from proscenium.interfaces.slack import slack_main
+from proscenium.interfaces.slack import SlackProductionProcessor
 
 logging.basicConfig(
     stream=sys.stdout,
@@ -52,7 +53,20 @@ def start(
     production.prepare_props()
     console.print("Props are up-to-date.")
 
-    slack_main(production, config, console)
+    slack_admin_channel = config.get("slack", {}).get("admin_channel", None)
+    slack_production_processor = SlackProductionProcessor(
+        production,
+        slack_admin_channel,
+        console,
+    )
+
+    try:
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        console.print("Exiting...")
+
+    slack_production_processor.shutdown()
 
 
 if __name__ == "__main__":

proscenium/interfaces/slack.py

@@ -1,7 +1,7 @@
 from typing import Callable
 from typing import Generator
+from typing import Optional
 
-import time
 import logging
 import os
 from rich.console import Console
@@ -11,7 +11,6 @@ from slack_sdk.web import WebClient
 from slack_sdk.socket_mode import SocketModeClient
 from slack_sdk.socket_mode.request import SocketModeRequest
 from slack_sdk.socket_mode.response import SocketModeResponse
-from slack_sdk.socket_mode.listeners import SocketModeRequestListener
 
 from proscenium.core import Production
 from proscenium.core import Character
@@ -187,7 +186,7 @@ def channel_table(channels_by_id) -> Table:
     return channel_table
 
 
-def bot_user_id(socket_mode_client: SocketModeClient, console: Console):
+def bot_user_id(socket_mode_client: SocketModeClient, console: Console) -> str:
 
     auth_response = socket_mode_client.web_client.auth_test()
 
@@ -239,113 +238,81 @@ Curtain up.
     )
 
 
-def listen(
-    socket_mode_client: SocketModeClient,
-    slack_listener: SocketModeRequestListener,
-    user_id: str,
-    console: Console,
-):
-    socket_mode_client.socket_mode_request_listeners.append(slack_listener)
-
-    try:
-        while True:
-            time.sleep(1)
-    except KeyboardInterrupt:
-        console.print("Exiting...")
-
-
-def send_curtain_down(
-    socket_mode_client: SocketModeClient, slack_admin_channel_id: str
-) -> None:
-    socket_mode_client.web_client.chat_postMessage(
-        channel=slack_admin_channel_id,
-        text="""Curtain down. We hope you enjoyed the show!""",
-    )
-
-
-def shutdown(
-    socket_mode_client: SocketModeClient,
-    slack_listener: SocketModeRequestListener,
-    user_id: str,
-    production: Production,
-    console: Console,
-):
-
-    socket_mode_client.socket_mode_request_listeners.remove(slack_listener)
-    socket_mode_client.disconnect()
-    console.print("Disconnected from Slack.")
-
-    production.curtain()
-
-    console.print("Handlers stopped.")
-
-
-def slack_main(
-    production: Production,
-    config: dict,
-    console: Console,
-) -> None:
-
-    slack_app_token, slack_bot_token = get_slack_auth()
-
-    socket_mode_client = connect(slack_app_token, slack_bot_token)
-
-    user_id = bot_user_id(socket_mode_client, console)
-    console.print()
-
-    channels_by_id, channel_name_to_id = channel_maps(socket_mode_client)
-    console.print(channel_table(channels_by_id))
-    console.print()
-
-    slack_admin_channel = config.get("slack", {}).get("admin_channel", None)
-
-    if slack_admin_channel is None:
-        raise ValueError(
-            "slack.admin_channel is not set. "
-            "Please set it to the channel name of the Proscenium admin channel."
-        )
-    slack_admin_channel_id = channel_name_to_id.get(slack_admin_channel, None)
-    if slack_admin_channel_id is None:
-        raise ValueError(
-            f"Admin channel {slack_admin_channel} not found in subscribed channels."
+class SlackProductionProcessor:
+
+    def __init__(
+        self,
+        production: Production,
+        slack_admin_channel: str,
+        console: Optional[Console] = None,
+        event_log: Optional[list[tuple[str, str]]] = None,
+    ):
+        self.production = production
+        self.console = console
+        self.event_log = event_log
+
+        slack_app_token, slack_bot_token = get_slack_auth()
+
+        self.socket_mode_client = connect(slack_app_token, slack_bot_token)
+
+        user_id = bot_user_id(self.socket_mode_client, console)
+        console.print()
+
+        channels_by_id, channel_name_to_id = channel_maps(self.socket_mode_client)
+        console.print(channel_table(channels_by_id))
+        console.print()
+
+        if slack_admin_channel is None:
+            raise ValueError(
+                "slack.admin_channel is not set. "
+                "Please set it to the channel name of the Proscenium admin channel."
+            )
+        slack_admin_channel_id = channel_name_to_id.get(slack_admin_channel, None)
+        if slack_admin_channel_id is None:
+            raise ValueError(
+                f"Admin channel {slack_admin_channel} not found in subscribed channels."
+            )
+
+        self.admin = Admin(slack_admin_channel_id, slack_admin_channel)
+
+        log.info("Places, please!")
+        channel_id_to_character = production.places(channel_name_to_id)
+        channel_id_to_character[slack_admin_channel_id] = self.admin
+
+        console.print(places_table(channel_id_to_character, channels_by_id))
+        console.print()
+
+        self.slack_listener = make_slack_listener(
+            user_id,
+            slack_admin_channel_id,
+            channels_by_id,
+            channel_id_to_character,
+            console,
         )
 
-    admin = Admin(slack_admin_channel_id)
-    log.info(
-        "Admin handler started %s %s.", slack_admin_channel, slack_admin_channel_id
-    )
-
-    log.info("Places, please!")
-    channel_id_to_character = production.places(channel_name_to_id)
-    channel_id_to_character[slack_admin_channel_id] = admin
+        send_curtain_up(self.socket_mode_client, production, slack_admin_channel_id)
 
-    console.print(places_table(channel_id_to_character, channels_by_id))
-    console.print()
-
-    slack_listener = make_slack_listener(
-        user_id,
-        slack_admin_channel_id,
-        channels_by_id,
-        channel_id_to_character,
-        console,
-    )
+        console.print("Starting the show. Listening for events...")
+        self.socket_mode_client.socket_mode_request_listeners.append(
+            self.slack_listener
+        )
 
-    send_curtain_up(socket_mode_client, production, slack_admin_channel_id)
+    def shutdown(
+        self,
+    ):
+        self.socket_mode_client.web_client.chat_postMessage(
+            channel=self.admin.channel_id,
+            text="""Curtain down. We hope you enjoyed the show!""",
+        )
 
-    console.print("Starting the show. Listening for events...")
-    listen(
-        socket_mode_client,
-        slack_listener,
-        user_id,
-        console,
-    )
+        self.socket_mode_client.socket_mode_request_listeners.remove(
+            self.slack_listener
+        )
+        self.socket_mode_client.disconnect()
+        if self.console is not None:
+            self.console.print("Disconnected from Slack.")
 
-    send_curtain_down(socket_mode_client, slack_admin_channel_id)
+        self.production.curtain()
 
-    shutdown(
-        socket_mode_client,
-        slack_listener,
-        user_id,
-        production,
-        console,
-    )
+        if self.console is not None:
+            self.console.print("Handlers stopped.")

proscenium/verbs/complete.py

@@ -48,23 +48,20 @@ from rich.panel import Panel
 from rich.table import Table
 from rich.text import Text
 
-from aisuite import Client
+from aisuite import Client as AISuiteClient
 from aisuite.framework.message import ChatCompletionMessageToolCall
 
 from proscenium.verbs.display.tools import complete_with_tools_panel
 
 log = logging.getLogger(__name__)
 
-provider_configs = {
-    # TODO expose this
-    "ollama": {"timeout": 180},
-}
-
-client = Client(provider_configs=provider_configs)
-
 
 def complete_simple(
-    model_id: str, system_prompt: str, user_prompt: str, **kwargs
+    chat_completion_client: AISuiteClient,
+    model_id: str,
+    system_prompt: str,
+    user_prompt: str,
+    **kwargs,
 ) -> str:
 
     console = kwargs.pop("console", None)
@@ -96,7 +93,7 @@ model_id: {model_id}
         )
         console.print(call_panel)
 
-    response = client.chat.completions.create(
+    response = chat_completion_client.chat.completions.create(
         model=model_id, messages=messages, **kwargs
     )
     response = response.choices[0].message.content
@@ -152,6 +149,7 @@ def evaluate_tool_calls(tool_call_message, tool_map: dict) -> list[dict]:
 
 
 def complete_for_tool_applications(
+    chat_completion_client: AISuiteClient,
     model_id: str,
     messages: list,
     tool_desc_list: list,
@@ -169,7 +167,7 @@ def complete_for_tool_applications(
         )
         console.print(panel)
 
-    response = client.chat.completions.create(
+    response = chat_completion_client.chat.completions.create(
         model=model_id,
         messages=messages,
         temperature=temperature,
@@ -180,6 +178,7 @@ def complete_for_tool_applications(
 
 
 def complete_with_tool_results(
+    chat_completion_client: AISuiteClient,
     model_id: str,
     messages: list,
     tool_call_message: dict,
@@ -202,7 +201,7 @@ def complete_with_tool_results(
         )
         console.print(panel)
 
-    response = client.chat.completions.create(
+    response = chat_completion_client.chat.completions.create(
         model=model_id,
         messages=messages,
     )

{proscenium-0.0.11.dist-info → proscenium-0.0.13.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: proscenium
-Version: 0.0.11
-Summary: Frame AI Agents
+Version: 0.0.13
+Summary: Declare Collaborative, Asynchronous Human To Agent Interactions
 Author-email: Adam Pingel <oss@pingel.org>
 License-Expression: Apache-2.0
 Requires-Python: >=3.11
@@ -20,11 +20,13 @@ Requires-Dist: click>=8.2.0; extra == "test"
 Requires-Dist: pytest>=8.3.5; extra == "test"
 Requires-Dist: neo4j>=5.28.1; extra == "test"
 Requires-Dist: gofannon>=0.25.13; extra == "test"
-Requires-Dist: lapidarist>=0.0.2; extra == "test"
+Requires-Dist: lapidarist>=0.0.4; extra == "test"
 Dynamic: license-file
 
 # Proscenium
 
+[![PyPI version](https://img.shields.io/pypi/v/proscenium.svg)](https://pypi.org/project/proscenium/)
+[![PyPI - Downloads](https://img.shields.io/pypi/dm/proscenium)](https://pypi.org/project/proscenium/)
 [![CI](https://github.com/The-AI-Alliance/proscenium/actions/workflows/pytest.yml/badge.svg)](https://github.com/The-AI-Alliance/proscenium/actions/workflows/pytest.yml)
 [![PyPI](https://img.shields.io/pypi/v/proscenium)](https://pypi.org/project/proscenium/)
 [![License](https://img.shields.io/github/license/The-AI-Alliance/proscenium)](https://github.com/The-AI-Alliance/proscenium/tree/main?tab=Apache-2.0-1-ov-file#readme)
@@ -33,8 +35,6 @@ Dynamic: license-file
 
 Proscenium is a small, experimental library of composable glue that allows for succinct construction of enterprise AI applications. It was started in February 2025 and is still in early development.
 
-Currently, proscenium development prioritizes support for domains where the creation and use of structured data is critical.
-
 See the [website](https://the-ai-alliance.github.io/proscenium/) for quickstart info, goals, and other links.
 
 To find the Proscenium community, see the [discussions](https://github.com/The-AI-Alliance/proscenium/discussions)

{proscenium-0.0.11.dist-info → proscenium-0.0.13.dist-info}/RECORD

@@ -1,26 +1,26 @@
 proscenium/__init__.py,sha256=nDWNd6_TSf4vDQuHVBoAf4QfZCB3ZUFQ0M7XvifNJ-g,78
-proscenium/admin/__init__.py,sha256=GqGrkf7NOm3inuo67xszkARXZYKDsDs2jHuZh1tF4n0,924
+proscenium/admin/__init__.py,sha256=31XUp83v7oCEXTeJb-GgnIitfs2EWovr3QJOewZ0zSg,1026
 proscenium/bin/__init__.py,sha256=ThVsDG6BmnZ86gYaZLGMDcNmR6fVwBLJG3k_JawfzOY,1160
-proscenium/bin/bot.py,sha256=kdZBe1SGM-S3-QSN-DM-_UnGwe6W5D32s-dTuczIPCU,1358
+proscenium/bin/bot.py,sha256=cuHj2-ldPXGRf75Ts_J_y4WfDgTB49iN3sNmnoKKFus,1713
 proscenium/core/__init__.py,sha256=aSUqPMn2LjZ0C_l9Tx6yqqlfCzM7oSljZxHosJyjlLU,4335
 proscenium/interfaces/__init__.py,sha256=nDWNd6_TSf4vDQuHVBoAf4QfZCB3ZUFQ0M7XvifNJ-g,78
-proscenium/interfaces/slack.py,sha256=wjkdhqAHgISxdNG5Pwo-8_QIyQf76X7b-0WwZfNabI8,10600
+proscenium/interfaces/slack.py,sha256=zfj1D4O6ucVdw6HFnBIMGAbZUb5XK17c-57une42C48,10205
 proscenium/patterns/__init__.py,sha256=nDWNd6_TSf4vDQuHVBoAf4QfZCB3ZUFQ0M7XvifNJ-g,78
 proscenium/patterns/graph_rag.py,sha256=1HH1xdlAA6ypvYdP4dWFm-KXrGPUmm0T4qIdAU8mgvE,1763
 proscenium/patterns/rag.py,sha256=iNPL7i8zfhEGIZAI7FjAs5yKgN1iV_E-PcJiQFrm7lE,2310
 proscenium/patterns/tools.py,sha256=f2CD6f7CYiSs0Tm1Ff1sOL5Ti6DqJ5HQvMI7NmIgqNs,1740
 proscenium/util/__init__.py,sha256=FC1hjA37VvmVpF9-OlYNp9TjArH6etr6KiAvF9t_6lI,679
 proscenium/verbs/__init__.py,sha256=nDWNd6_TSf4vDQuHVBoAf4QfZCB3ZUFQ0M7XvifNJ-g,78
-proscenium/verbs/complete.py,sha256=Y1T49OfAV7K8p0DMzE4aVqtkgVfjUqb6IeOazzdYGow,5071
+proscenium/verbs/complete.py,sha256=oRvIt6NR9yhzEHpT1BRKAmf05hVXI91v83A-7OSo-zs,5147
 proscenium/verbs/display.py,sha256=hHFmktyJtjYLi4I1-8HUfmsuoMTIxc6JFfczASBsCbI,260
 proscenium/verbs/invoke.py,sha256=-Bk7Pp0EEwRTS0MJUlViZeUNo8wxnDKJj5q78KU4CdM,339
 proscenium/verbs/remember.py,sha256=Hh9BDRAYf7MGeMD4MzU73p6Q28KrSiLWPx4GjTW1amQ,296
 proscenium/verbs/display/__init__.py,sha256=GXuvaMld8tzfJGngHdwVT-YLnuRmW2G0pMdti9Vj53s,238
 proscenium/verbs/display/chat.py,sha256=2THBUdhG3cIIVZOnJ_AMYL4nWXKFG2cuSkX6wkm48yQ,1148
 proscenium/verbs/display/tools.py,sha256=eR5g-r7MGKFZY0qg-ndkW3p0mfbupV0UaAUFqJPfnNM,1491
-proscenium-0.0.11.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-proscenium-0.0.11.dist-info/METADATA,sha256=wVnK3-0GveteN4CZ4JbmD2ytWZoBu7h8JoZ28ZUdl4w,2102
-proscenium-0.0.11.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-proscenium-0.0.11.dist-info/entry_points.txt,sha256=bbrDWv4WKIx9UROGXcyH0eo40F8SNpDQKvXxoE8BTHI,58
-proscenium-0.0.11.dist-info/top_level.txt,sha256=aiTgQy73e21wnSSxM5iICXmXT3zldN8cFKeXpvJ5Xx4,11
-proscenium-0.0.11.dist-info/RECORD,,
+proscenium-0.0.13.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+proscenium-0.0.13.dist-info/METADATA,sha256=50Uqw56v2u2hdl8onbJWYfXSqPMgSdK_0Y6djW68OrA,2229
+proscenium-0.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+proscenium-0.0.13.dist-info/entry_points.txt,sha256=bbrDWv4WKIx9UROGXcyH0eo40F8SNpDQKvXxoE8BTHI,58
+proscenium-0.0.13.dist-info/top_level.txt,sha256=aiTgQy73e21wnSSxM5iICXmXT3zldN8cFKeXpvJ5Xx4,11
+proscenium-0.0.13.dist-info/RECORD,,

{proscenium-0.0.11.dist-info → proscenium-0.0.13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any