From e651e04100049264fd4f4f013020715feef44542 Mon Sep 17 00:00:00 2001 From: Siddharth Balyan <52913345+alt-glitch@users.noreply.github.com> Date: Mon, 6 Apr 2026 15:51:19 -0700 Subject: [PATCH] fix(nix): read version, regen uv.lock, fix packages.nix to add hermes_logging (#5651) * - read version from pyproject for nix - regen uv.lock - add hermes_logging to packages.nix * fix secret regen w/ sops --- nix/nixosModules.nix | 2 +- nix/packages.nix | 2 +- pyproject.toml | 2 +- uv.lock | 10 ++++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/nix/nixosModules.nix b/nix/nixosModules.nix index 0e15c6f53..acf9a6e9d 100644 --- a/nix/nixosModules.nix +++ b/nix/nixosModules.nix @@ -561,7 +561,7 @@ # ── Activation: link config + auth + documents ──────────────────── { - system.activationScripts."hermes-agent-setup" = lib.stringAfter [ "users" ] '' + system.activationScripts."hermes-agent-setup" = lib.stringAfter [ "users" "setupSecrets" ] '' # Ensure directories exist (activation runs before tmpfiles) mkdir -p ${cfg.stateDir}/.hermes mkdir -p ${cfg.stateDir}/home diff --git a/nix/packages.nix b/nix/packages.nix index 805f76605..9a65b889d 100644 --- a/nix/packages.nix +++ b/nix/packages.nix @@ -21,7 +21,7 @@ in { packages.default = pkgs.stdenv.mkDerivation { pname = "hermes-agent"; - version = "0.1.0"; + version = (builtins.fromTOML (builtins.readFile ../pyproject.toml)).project.version; dontUnpack = true; dontBuild = true; diff --git a/pyproject.toml b/pyproject.toml index 14a35607a..c35c94e21 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -102,7 +102,7 @@ hermes-agent = "run_agent:main" hermes-acp = "acp_adapter.entry:main" [tool.setuptools] -py-modules = ["run_agent", "model_tools", "toolsets", "batch_runner", "trajectory_compressor", "toolset_distributions", "cli", "hermes_constants", "hermes_state", "hermes_time", "rl_cli", "utils"] +py-modules = ["run_agent", "model_tools", "toolsets", "batch_runner", "trajectory_compressor", "toolset_distributions", "cli", "hermes_constants", "hermes_state", "hermes_time", "hermes_logging", "rl_cli", "utils"] [tool.setuptools.packages.find] include = ["agent", "tools", "tools.*", "hermes_cli", "gateway", "gateway.*", "cron", "acp_adapter", "plugins", "plugins.*"] diff --git a/uv.lock b/uv.lock index d0bf6e923..8a5db5436 100644 --- a/uv.lock +++ b/uv.lock @@ -10,14 +10,14 @@ resolution-markers = [ [[package]] name = "agent-client-protocol" -version = "0.8.1" +version = "0.9.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "pydantic" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/1b/7b/7cdac86db388809d9e3bc58cac88cc7dfa49b7615b98fab304a828cd7f8a/agent_client_protocol-0.8.1.tar.gz", hash = "sha256:1bbf15663bf51f64942597f638e32a6284c5da918055d9672d3510e965143dbd", size = 68866, upload-time = "2026-02-13T15:34:54.567Z" } +sdist = { url = "https://files.pythonhosted.org/packages/eb/13/3b893421369767e7043cc115d6ef0df417c298b84563be3a12df0416158d/agent_client_protocol-0.9.0.tar.gz", hash = "sha256:f744c48ab9af0f0b4452e5ab5498d61bcab97c26dbe7d6feec5fd36de49be30b", size = 71853, upload-time = "2026-03-26T01:21:00.379Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/4b/f3/219eeca0ad4a20843d4b9eaac5532f87018b9d25730a62a16f54f6c52d1a/agent_client_protocol-0.8.1-py3-none-any.whl", hash = "sha256:9421a11fd435b4831660272d169c3812d553bb7247049c138c3ca127e4b8af8e", size = 54529, upload-time = "2026-02-13T15:34:53.344Z" }, + { url = "https://files.pythonhosted.org/packages/8f/ed/c284543c08aa443a4ef2c8bd120be51da8433dd174c01749b5d87c333f22/agent_client_protocol-0.9.0-py3-none-any.whl", hash = "sha256:06911500b51d8cb69112544e2be01fc5e7db39ef88fecbc3848c5c6f194798ee", size = 56850, upload-time = "2026-03-26T01:20:59.252Z" }, ] [[package]] @@ -1725,6 +1725,7 @@ honcho = [ { name = "honcho-ai" }, ] matrix = [ + { name = "markdown" }, { name = "matrix-nio", extra = ["e2e"] }, ] mcp = [ @@ -1772,7 +1773,7 @@ yc-bench = [ [package.metadata] requires-dist = [ - { name = "agent-client-protocol", marker = "extra == 'acp'", specifier = ">=0.8.1,<0.9" }, + { name = "agent-client-protocol", marker = "extra == 'acp'", specifier = ">=0.9.0,<1.0" }, { name = "aiohttp", marker = "extra == 'homeassistant'", specifier = ">=3.9.0,<4" }, { name = "aiohttp", marker = "extra == 'messaging'", specifier = ">=3.13.3,<4" }, { name = "aiohttp", marker = "extra == 'sms'", specifier = ">=3.9.0,<4" }, @@ -1812,6 +1813,7 @@ requires-dist = [ { name = "httpx", specifier = ">=0.28.1,<1" }, { name = "jinja2", specifier = ">=3.1.5,<4" }, { name = "lark-oapi", marker = "extra == 'feishu'", specifier = ">=1.5.3,<2" }, + { name = "markdown", marker = "extra == 'matrix'", specifier = ">=3.6,<4" }, { name = "matrix-nio", extras = ["e2e"], marker = "extra == 'matrix'", specifier = ">=0.24.0,<1" }, { name = "mcp", marker = "extra == 'dev'", specifier = ">=1.2.0,<2" }, { name = "mcp", marker = "extra == 'mcp'", specifier = ">=1.2.0,<2" },