update

Author: Tom Softreck

.gitignore

@@ -1,6 +1,7 @@
 .idea
 .old
 .todo.txt
+pyproject.toml.bak
 old
 cleanup_old_repo.sh
 poetry.lock

Makefile

@@ -41,6 +41,11 @@ install:
 	pip install python-nmap opencv-python pycups
 	@echo "✅ DialogChain installed"
 
+venv:
+	python3 -m venv venv
+	source venv/bin/activate
+	@echo "✅ Virtual environment created"
+
 dev: install
 	pip install -e ".[dev]"
 	@echo "✅ Development environment ready"
@@ -62,7 +67,7 @@ install-deps:
 	@which cargo > /dev/null && echo "✅ Rust found: $$(cargo --version)"
 
 # Development
-test: test-unit test-integration test-e2e
+test: venv test-unit test-integration test-e2e
 
 # Run unit tests
 test-unit:
@@ -184,7 +189,7 @@ endef
 PYPI_TOKEN_FROM_FILE := $(call get_pypi_token)
 
 # Publishing
-publish:
+publish: venv
 	@echo "🔄 Bumping version..."
 	poetry version patch
 	@echo "🧹 Cleaning build artifacts..."
@@ -258,7 +263,7 @@ docker-run: docker
 		dialogchain run -c examples/simple_routes.yaml
 
 # Examples and setup
-setup-env:
+setup-env: venv
 	@if [ ! -f .env ]; then \
 		if [ -f .env.example ]; then \
 			cp .env.example .env; \

pyproject.toml

@@ -1,10 +1,6 @@
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
-
 [tool.poetry]
 name = "dialogchain"
-version = "0.1.11"
+version = "0.1.12"
 description = "DialogChain - A flexible and extensible dialog processing framework"
 authors = ["Tom Sapletta <info@softreck.dev>"]
 readme = "README.md"
@@ -27,132 +23,72 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Artificial Intelligence",
     "Topic :: Text Processing :: Linguistic",
 ]
-packages = [{include = "dialogchain", from = "src"}]
 
 [tool.poetry.dependencies]
-python = ">=3.8.1,<3.13"
-click = ">=8.0.0,<9.0.0"
-pyyaml = ">=6.0,<7.0"
-python-dotenv = ">=1.0.0,<2.0.0"
-aiohttp = ">=3.8.0,<4.0.0"
-asyncio-mqtt = ">=0.13.0,<0.14.0"
-grpcio = ">=1.50.0,<2.0.0"
-grpcio-tools = ">=1.50.0,<2.0.0"
-jinja2 = ">=3.1.0,<4.0.0"
-opencv-python = ">=4.7.0,<5.0.0"
-numpy = ">=1.21.0,<2.0.0"
-python-nmap = ">=0.7.1,<1.0.0"
+python = "^3.8.1"
+click = "^8.0.0"
+pyyaml = "^6.0.0"
+python-dotenv = "^1.0.0"
+aiohttp = "^3.8.0"
+asyncio-mqtt = "^0.13.0"
+grpcio = "^1.50.0"
+grpcio-tools = "^1.50.0"
+jinja2 = "^3.1.0"
+opencv-python = "^4.7.0"
+numpy = "^1.21.0"
+python-nmap = "^0.7.1"
+aiofiles = "^24.1.0"
 
 [tool.poetry.group.dev.dependencies]
-# Code formatting
 black = "^23.0.0"
 isort = "^5.12.0"
+pytest = "^7.0.0"
+pytest-asyncio = "^0.20.0"
+pytest-cov = "^4.0.0"
+pytest-mock = "^3.10.0"
+pytest-aiohttp = "^1.0.0"
+pytest-xdist = "^3.0.0"
+mypy = "^1.0.0"
 
-# Linting
-flake8 = "^6.0.0"
-flake8-bugbear = "^23.7.0"
-flake8-annotations = "^3.0.1"
-flake8-bandit = "^4.1.1"
-flake8-docstrings = "^1.7.0"
-flake8-import-order = "^0.18.2"
-pep8-naming = "^0.13.3"
-
-# Type checking
-mypy = "^1.5.0"
-types-PyYAML = "^6.0.12"
-types-requests = "^2.31.0"
-types-python-dateutil = "^2.8.19"
-
-# Testing
-pytest = "^7.4.0"
-pytest-asyncio = "^0.21.1"
-pytest-cov = "^4.1.0"
-pytest-mock = "^3.11.1"
-pytest-aiohttp = "^1.0.5"
-pytest-xdist = "^3.3.1"
-coverage = {extras = ["toml"], version = "^7.3.0"}
-
-# Documentation
-sphinx = "^7.0.1"
-sphinx-rtd-theme = "^1.2.2"
-sphinx-autodoc-typehints = "^1.23.0"
-sphinx-copybutton = "^0.5.2"
-
-# Development tools
-pre-commit = "^3.3.3"
-invoke = "^2.1.2"
-bandit = "^1.7.5"
-safety = "^2.3.5"
-vulture = "^2.7"
-
-# Type stubs
-typing-extensions = "^4.6.3"
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.scripts]
 dialogchain = "dialogchain.cli:main"
 
 [tool.black]
-line-length = 88
-target-version = ['py38']
+line-length = 120
+target-version = ['py38', 'py39', 'py310', 'py311', 'py312']
 include = '\.pyi?$'
 
 [tool.isort]
 profile = "black"
-line_length = 88
-multi_line_output = 3
-include_trailing_comma = true
-force_grid_wrap = 0
-use_parentheses = true
-ensure_newline_before_comments = true
-
-[tool.mypy]
-python_version = "3.8"
-warn_return_any = true
-warn_unused_configs = true
-disallow_untyped_defs = true
-check_untyped_defs = true
-no_implicit_optional = true
-strict_optional = true
-warn_redundant_casts = true
-warn_unused_ignores = true
-warn_no_return = true
-warn_unreachable = true
-
-[[tool.mypy.overrides]]
-module = [
-    "cv2.*",
-    "nmap.*",
-    "grpc.*",
-    "asyncio_mqtt.*"
-]
-ignore_missing_imports = true
-
-[[tool.mypy.overrides]]
-module = ["tests.*"]
-disallow_untyped_defs = false
+line_length = 120
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 python_files = ["test_*.py"]
-python_classes = ["Test*"]
 python_functions = ["test_*"]
-addopts = "-v --cov=src/dialogchain --cov-report=term-missing --cov-report=xml"
-asyncio_mode = "auto"
+python_classes = ["Test*"]
+pythonpath = ["src"]
+addopts = "-v --cov=dialogchain --cov-report=term-missing"
 
 [tool.coverage.run]
-source = ["src/dialogchain"]
-omit = ["tests/*", "*/tests/*"]
+source = ["dialogchain"]
+omit = ["tests/*"]
 
 [tool.coverage.report]
-show_missing = true
 fail_under = 80
+show_missing = true
 exclude_lines = [
     "pragma: no cover",
     "def __repr__",
     "if self.debug:",
     "if settings.DEBUG",
-    "raise AssertionError",
+    "raise ImportError",
     "raise NotImplementedError",
+    "raise Exception",
     "if 0:",
-    "if __name__ == .__main__.:"
-]
+    "if __name__ == .__main__.:",
+]