From bb1120b60f56116f434c62423618bbd4fd8bf03a Mon Sep 17 00:00:00 2001 From: aitbc Date: Sat, 18 Apr 2026 20:56:12 +0200 Subject: [PATCH] ci: replace hardcoded /opt/aitbc paths with relative paths - Update integration-tests workflow to use ./scripts/utils/link-systemd.sh instead of /opt/aitbc/scripts/utils/link-systemd.sh - Change aitbc-cli symlink from /opt/aitbc/cli/aitbc_cli.py to cli/aitbc_cli.py - Fix duplicate [tool.mypy] section in agent-coordinator pyproject.toml by merging plugins config - Update aitbc-core package include path from aitbc_core to aitbc - Fix aitbc-crypto imports to use absolute package paths instead of relative imports - Add pynacl>=1.5.0 dependency --- .gitea/workflows/integration-tests.yml | 8 ++++---- aitbc-cli | 2 +- apps/agent-coordinator/pyproject.toml | 4 +--- docs/policies/DOTENV_DISCIPLINE.md | 2 -- packages/py/aitbc-core/pyproject.toml | 2 +- packages/py/aitbc-crypto/src/__init__.py | 4 ++-- packages/py/aitbc-sdk/pyproject.toml | 3 ++- packages/solidity/aitbc-token/package.json | 2 +- 8 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.gitea/workflows/integration-tests.yml b/.gitea/workflows/integration-tests.yml index e775e945..c2d1792a 100644 --- a/.gitea/workflows/integration-tests.yml +++ b/.gitea/workflows/integration-tests.yml @@ -35,15 +35,15 @@ jobs: cd /var/lib/aitbc-workspaces/integration-tests/repo if [[ -d "systemd" ]]; then echo "Linking systemd service files..." - if [[ -x /opt/aitbc/scripts/utils/link-systemd.sh ]]; then + if [[ -x scripts/utils/link-systemd.sh ]]; then if [[ $EUID -eq 0 ]]; then - /opt/aitbc/scripts/utils/link-systemd.sh + ./scripts/utils/link-systemd.sh else - sudo /opt/aitbc/scripts/utils/link-systemd.sh + sudo ./scripts/utils/link-systemd.sh fi echo "✅ Systemd files linked" else - echo "❌ /opt/aitbc/scripts/utils/link-systemd.sh not found" + echo "❌ scripts/utils/link-systemd.sh not found" exit 1 fi fi diff --git a/aitbc-cli b/aitbc-cli index 82e91a9b..6fc6d05e 120000 --- a/aitbc-cli +++ b/aitbc-cli @@ -1 +1 @@ -/opt/aitbc/cli/aitbc_cli.py \ No newline at end of file +cli/aitbc_cli.py \ No newline at end of file diff --git a/apps/agent-coordinator/pyproject.toml b/apps/agent-coordinator/pyproject.toml index c129dda6..4b1738b0 100644 --- a/apps/agent-coordinator/pyproject.toml +++ b/apps/agent-coordinator/pyproject.toml @@ -41,6 +41,7 @@ warn_unused_ignores = true warn_no_return = true warn_unreachable = true strict_equality = true +plugins = ["pydantic_pydantic_plugin"] [[tool.mypy.overrides]] module = [ @@ -52,9 +53,6 @@ module = [ ] ignore_missing_imports = true -[tool.mypy] -plugins = ["pydantic_pydantic_plugin"] - [tool.black] line-length = 88 target-version = ['py39'] diff --git a/docs/policies/DOTENV_DISCIPLINE.md b/docs/policies/DOTENV_DISCIPLINE.md index 0729c1c4..c451c0d3 100644 --- a/docs/policies/DOTENV_DISCIPLINE.md +++ b/docs/policies/DOTENV_DISCIPLINE.md @@ -16,7 +16,6 @@ silent configuration issues where: ### **Focused Dotenv Linter** Created a sophisticated linter that: - - **Scans all code** for actual environment variable usage - **Filters out script variables** and non-config variables - **Compares with `.env.example`** to find drift @@ -143,7 +142,6 @@ Created `.github/workflows/dotenv-check.yml` with: ### **Workflow Triggers** The dotenv check runs on: - - **Push** to any branch (when relevant files change) - **Pull Request** (when relevant files change) - File patterns: `.env.example`, `*.py`, `*.yml`, `*.toml`, `*.sh` diff --git a/packages/py/aitbc-core/pyproject.toml b/packages/py/aitbc-core/pyproject.toml index 3cc95aa1..31be84fd 100644 --- a/packages/py/aitbc-core/pyproject.toml +++ b/packages/py/aitbc-core/pyproject.toml @@ -22,5 +22,5 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] packages = [ - { include = "aitbc_core", from = "src" } + { include = "aitbc", from = "src" } ] diff --git a/packages/py/aitbc-crypto/src/__init__.py b/packages/py/aitbc-crypto/src/__init__.py index ceafef51..dbfbeb31 100755 --- a/packages/py/aitbc-crypto/src/__init__.py +++ b/packages/py/aitbc-crypto/src/__init__.py @@ -1,4 +1,4 @@ """AITBC crypto utilities package.""" -from . import receipt # noqa: F401 -from . import signing # noqa: F401 +from aitbc_crypto import receipt # noqa: F401 +from aitbc_crypto import signing # noqa: F401 diff --git a/packages/py/aitbc-sdk/pyproject.toml b/packages/py/aitbc-sdk/pyproject.toml index c8c3f466..1d0f6dad 100644 --- a/packages/py/aitbc-sdk/pyproject.toml +++ b/packages/py/aitbc-sdk/pyproject.toml @@ -11,7 +11,8 @@ dependencies = [ "cryptography>=41.0.0", "requests>=2.31.0", "pydantic>=2.5.0", - "httpx>=0.25.0" + "httpx>=0.25.0", + "pynacl>=1.5.0" ] [build-system] diff --git a/packages/solidity/aitbc-token/package.json b/packages/solidity/aitbc-token/package.json index bbb8f08c..22564cb8 100644 --- a/packages/solidity/aitbc-token/package.json +++ b/packages/solidity/aitbc-token/package.json @@ -16,7 +16,7 @@ "@nomicfoundation/hardhat-ethers": "^4.0.7", "@nomicfoundation/hardhat-ignition-ethers": "^3.1.1", "@nomicfoundation/hardhat-network-helpers": "^3.0.4", - "@nomicfoundation/hardhat-toolbox": "^7.0.0", + "@nomicfoundation/hardhat-toolbox": "^7.0.0-hh2", "@nomicfoundation/hardhat-verify": "^3.0.13", "@typechain/ethers-v6": "^0.5.1", "@typechain/hardhat": "^6.0.0",