Merge remote-tracking branch 'origin/main' into tkp/ct

Author: timkpaine

.copier-answers.yaml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: b74d698
+_commit: 9be318c
 _src_path: https://github.com/python-project-templates/base.git
 add_docs: false
 add_extension: python

.github/workflows/build.yaml

@@ -55,7 +55,7 @@ jobs:
       run: make coverage
 
     - name: Upload test results (Python)
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: test-results-${{ matrix.os }}-${{ matrix.python-version }}
         path: junit.xml
@@ -74,7 +74,7 @@ jobs:
     - name: Make dist
       run: make dist
 
-    - uses: actions/upload-artifact@v6
+    - uses: actions/upload-artifact@v7
       with:
         name: dist-${{matrix.os}}
         path: dist

.gitignore

@@ -11,6 +11,9 @@ __pycache__/
 *.exp
 *.lib
 
+# Rust
+target
+
 # Distribution / packaging
 .Python
 build/
@@ -55,26 +58,12 @@ junit.xml
 .hypothesis/
 .pytest_cache/
 
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
+# Django
 *.log
 local_settings.py
 db.sqlite3
 db.sqlite3-journal
 
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# PyBuilder
-target/
-
 # IPython
 profile_default/
 ipython_config.py
@@ -85,15 +74,12 @@ ipython_config.py
 # pipenv
 Pipfile.lock
 
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
+# Celery
 celerybeat-schedule
 celerybeat.pid
 
-# SageMath parsed files
-*.sage.py
+# Airspeed Velocity
+.asv
 
 # Environments
 .env
@@ -141,14 +127,12 @@ js/node_modules
 js/test-results
 js/playwright-report
 js/*.tgz
-csp_bot/extension
 
 # Jupyter
 .ipynb_checkpoints
 .autoversion
 Untitled*.ipynb
-!csp_bot/extension/csp_bot.json
-!csp_bot/extension/install.json
+csp_bot/extension
 csp_bot/nbextension
 csp_bot/labextension
 
@@ -158,12 +142,18 @@ csp_bot/labextension
 # Rust
 target
 
+# Hydra
+outputs/
+multirun/
+
+# AI
+ROADMAP.md
+AGENTS.md
+.github/hooks/sdlc.json
+
 # Secrets
 .discord_token
 .slack_app_token
 .slack_bot_token
 .symphony_cert
 .symphony_key
-
-# Outputs
-outputs

Makefile

@@ -46,12 +46,15 @@ format: fix
 ################
 # Other Checks #
 ################
-.PHONY: check-manifest checks check
+.PHONY: check-dist check-types checks check
 
-check-manifest:  ## check python sdist manifest with check-manifest
-	check-manifest -v
+check-dist:  ## check python sdist and wheel with check-dist
+	check-dist -v
 
-checks: check-manifest
+check-types:  ## check python types with ty
+	ty check --python $$(which python)
+
+checks: check-dist
 
 # Alias
 check: checks

csp_bot/backends/slack.py

@@ -18,7 +18,7 @@
         SlackPresenceStatus,
         SlackUser,
     )
-    from csp_adapter_slack import SlackAdapter
+    from csp_adapter_slack.v1 import SlackAdapter
 except ImportError:
     from chatom import Message as ChatomMessage, User as ChatomUser
     from pydantic import BaseModel

csp_bot/backends/symphony.py

@@ -18,7 +18,7 @@
         SymphonyPresenceStatus,
         SymphonyUser,
     )
-    from csp_adapter_symphony import SymphonyAdapter
+    from csp_adapter_symphony.v1 import SymphonyAdapter
 except ImportError:
     from chatom import Message as ChatomMessage, User as ChatomUser
     from pydantic import BaseModel

csp_bot/commands/base.py

@@ -7,9 +7,9 @@
 from abc import ABC, abstractmethod
 from typing import List, Type, Union
 
+from ccflow import BaseModel
 from chatom import Message
 
-from ccflow import BaseModel
 from csp_bot.structs import Backend, BotCommand, BotMessage, CommandVariant
 
 

csp_bot/config/conf.yaml

@@ -12,7 +12,6 @@ start:
   rest: true
   ui: false
 
-authenticate: False
 port: 8000
 
 gateway:
@@ -31,7 +30,6 @@ gateway:
     - /commands/status
   settings:
     PORT: ${port}
-    AUTHENTICATE: ${authenticate}
 
 hydra:
   run:

pyproject.toml

@@ -1,10 +1,14 @@
 [build-system]
-requires = ["hatchling"]
-build-backend="hatchling.build"
+requires = [
+    "hatchling",
+]
+build-backend = "hatchling.build"
 
 [project]
 name = "csp-bot"
-authors = [{name = "Point72, L.P.", email = "OpenSource@point72.com"}]
+authors = [
+    {name = "Point72, L.P.", email = "OpenSource@point72.com"},
+]
 description = "Reactive chat bot framework"
 readme = "README.md"
 license = { text = "Apache-2.0" }
@@ -35,9 +39,10 @@ classifiers = [
 dependencies = [
     "beautifulsoup4",
     "ccflow>=0.5.2",
+    "chatom",
     "croniter",
     "csp>=0.9,<1",
-    "csp-gateway>=2,<3",
+    "csp-gateway>=2.5,<2.6",
     "dateparser",
     "hydra-core",
     "pandas",
@@ -48,18 +53,19 @@ dependencies = [
 develop = [
     "build",
     "bump-my-version",
-    "check-manifest",
-    "codespell>=2.4,<2.5",
-    "csp-adapter-discord>=0.1,<0.2",
-    "csp-adapter-slack>=0.3,<0.4",
-    "csp-adapter-symphony>=0.3,<0.4",
+    "check-dist",
+    "codespell",
+    "csp-adapter-discord>=0.2,<0.3",
+    "csp-adapter-slack>=0.4,<0.5",
+    "csp-adapter-symphony>=0.4,<0.5",
     "hatchling",
-    "mdformat>=0.7.22,<1.1",
+    "mdformat",
     "mdformat-tables>=1",
     "pytest",
     "pytest-cov",
-    "ruff>=0.9,<0.15",
+    "ruff",
     "twine",
+    "ty",
     "uv",
     "wheel",
     # tests
@@ -89,19 +95,12 @@ filename = "pyproject.toml"
 search = 'version = "{current_version}"'
 replace = 'version = "{new_version}"'
 
-[tool.check-manifest]
-ignore = [
-    ".copier-answers.yaml",
-    "Makefile",
-    "docs/**/*",
-    "example/**/*",
-]
-
 [tool.coverage.run]
 branch = true
 omit = [
     "csp_bot/tests/integration/",
 ]
+
 [tool.coverage.report]
 exclude_also = [
     "raise NotImplementedError",
@@ -118,31 +117,60 @@ artifacts = []
 src = "/"
 
 [tool.hatch.build.targets.sdist]
-packages = ["csp_bot"]
-exclude = ["/docs", "/example"]
+packages = [
+    "csp_bot",
+]
+exclude = [
+    "docs",
+    "example",
+]
 
 [tool.hatch.build.targets.wheel]
-packages = ["csp_bot"]
-exclude = ["/docs", "/example"]
+packages = [
+    "csp_bot",
+]
+exclude = [
+    "docs",
+    "example",
+]
 
 [tool.hatch.build.targets.wheel.shared-data]
 
 [tool.pytest.ini_options]
-addopts = ["-vvv", "--junitxml=junit.xml"]
+addopts = [
+    "-vvv",
+    "--junitxml=junit.xml",
+]
 testpaths = "csp_bot/tests"
 
 [tool.ruff]
 line-length = 150
 
 [tool.ruff.lint]
-extend-select = ["I"]
+extend-select = [
+    "I",
+]
 
 [tool.ruff.lint.isort]
 combine-as-imports = true
 default-section = "third-party"
-known-first-party = ["csp_bot"]
-section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
+known-first-party = [
+    "csp_bot",
+]
+section-order = [
+    "future",
+    "standard-library",
+    "third-party",
+    "first-party",
+    "local-folder",
+]
 
 [tool.ruff.lint.per-file-ignores]
-"__init__.py" = ["F401", "F403"]
-"csp_bot/backends" = ["F401", "F403"]
+"__init__.py" = [
+    "F401",
+    "F403",
+]
+"csp_bot/backends" = [
+    "F401",
+    "F403",
+]