update

flake.lock

@@ -1,30 +1,15 @@
 {
   "nodes": {
-    "bash": {
-      "locked": {
-        "lastModified": 1678247195,
-        "narHash": "sha256-m/wSwlSket+hob3JED4XUvoWJLtW7yhtOiZrlRDMShs=",
-        "ref": "refs/heads/main",
-        "rev": "e7a00dcc0e75bc3ef6856bdd94d7d809245f5636",
-        "revCount": 1,
-        "type": "git",
-        "url": "https://git.ocjtech.us/jeff/nixos-bash-prompt-builder.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.ocjtech.us/jeff/nixos-bash-prompt-builder.git"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1692799911,
+        "lastModified": 1726560853,
-        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -38,11 +23,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1689068808,
+        "lastModified": 1726560853,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -74,11 +59,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688870561,
+        "lastModified": 1729742964,
-        "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=",
+        "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
         "owner": "nix-community",
         "repo": "nix-github-actions",
-        "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301",
+        "rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
         "type": "github"
       },
       "original": {
@@ -89,16 +74,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1693341273,
+        "lastModified": 1730785428,
-        "narHash": "sha256-wrsPjsIx2767909MPGhSIOmkpGELM9eufqLQOPxmZQg=",
+        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2ab91c8d65c00fd22a441c69bbf1bc9b420d5ea1",
+        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-23.05",
+        "ref": "nixos-unstable",
         "type": "indirect"
       }
     },
@@ -108,14 +93,16 @@
         "nix-github-actions": "nix-github-actions",
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "systems": "systems_3",
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1693051011,
+        "lastModified": 1731025526,
-        "narHash": "sha256-HNbuVCS/Fnl1YZOjBk9/MlIem+wM8fvIzTH0CVQrLSQ=",
+        "narHash": "sha256-z0jMgVMXEkn6lmFNu2oSrcOKGwymvthyPWPjxXOi1eA=",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "5b3a5151cf212021ff8d424f215fb030e4ff2837",
+        "rev": "be0cb8b526f05d636a19c466148c458ad18a5660",
         "type": "github"
       },
       "original": {
@@ -126,7 +113,6 @@
     },
     "root": {
       "inputs": {
-        "bash": "bash",
         "flake-utils": "flake-utils",
         "make-shell": "make-shell",
         "nixpkgs": "nixpkgs",
@@ -162,6 +148,41 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "id": "systems",
+        "type": "indirect"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "poetry2nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1730120726,
+        "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs = {
-      url = "nixpkgs/nixos-23.05";
+      url = "nixpkgs/nixos-unstable";
     };
     poetry2nix = {
       url = "github:nix-community/poetry2nix";
@@ -12,39 +12,35 @@
     flake-utils = {
       url = "github:numtide/flake-utils";
     };
-    bash = {
-      url = "git+https://git.ocjtech.us/jeff/nixos-bash-prompt-builder.git";
-    };
     make-shell = {
       url = "github:ursi/nix-make-shell";
     };
   };
-  outputs = { self, nixpkgs, poetry2nix, flake-utils, bash, make-shell, ... }@inputs:
+  outputs = {
+    self,
+    nixpkgs,
+    poetry2nix,
+    flake-utils,
+    ...
+  } @ inputs:
     flake-utils.lib.eachDefaultSystem
-      (system:
+    (
-        let
+      system: let
-          inherit (poetry2nix.legacyPackages.${system}) mkPoetryApplication overrides;
         pkgs = import nixpkgs {
           inherit system;
         };
-          python = pkgs.python311.withPackages (ps: with ps; [
+        inherit (poetry2nix.lib.mkPoetry2Nix {inherit pkgs;}) mkPoetryApplication overrides;
+        python = pkgs.python312.withPackages (ps:
+          with ps; [
             poetry-core
           ]);
-        in
+      in {
-        {
+        devShells.default = let
-          devShells.default =
-            let
           make-shell = import inputs.make-shell {
             inherit system;
             pkgs = pkgs;
           };
           project = "greendeck";
-              prompt = (
-                bash.build_prompt
-                  bash.ansi_normal_blue
-                  "${project} - ${bash.username}@${bash.hostname_short}: ${bash.current_working_directory}"
-                  "${project}:${bash.current_working_directory}"
-              );
         in
           make-shell {
             packages = [
@@ -57,7 +53,7 @@
               HIDAPI_HOME = pkgs.hidapi;
               MAGICK_HOME = pkgs.imagemagickBig;
               POETRY_VIRTUALENVS_IN_PROJECT = "true";
-                PS1 = prompt;
+              name = project;
             };
             setup = ''
               export PATH=''$(pwd)/.venv/bin:$PATH
@@ -67,7 +63,7 @@
           greendeck = mkPoetryApplication {
             python = pkgs.python311;
             projectDir = ./.;
-              groups = [ ];
+            groups = [];
             propagatedBuildInputs = [
               pkgs.hidapi
             ];
@@ -77,10 +73,12 @@
                   'os.getenv("HIDAPI_LIBRARY")' \
                   '"${pkgs.hidapi}/lib/libhidapi-libusb.so.0"'
             '';
-              overrides = overrides.withDefaults
+            overrides =
+              overrides.withDefaults
               (
                 self: super: {
-                    wand = super.wand.overridePythonAttrs
+                  wand =
+                    super.wand.overridePythonAttrs
                     (
                       old: {
                         postPatch = ''
@@ -89,7 +87,7 @@
                               "os.environ.get('MAGICK_HOME')" \
                               "'${pkgs.imagemagickBig}'"
                         '';
-                          propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.imagemagickBig ];
+                        propagatedBuildInputs = old.propagatedBuildInputs ++ [pkgs.imagemagickBig];
                       }
                     );
                   # attrs = super.pydantic-yaml.overridePythonAttrs (
@@ -104,12 +102,12 @@
                   # );
                   pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (
                     old: {
-                        buildInputs = old.buildInputs ++ [ self.setuptools ];
+                      buildInputs = old.buildInputs ++ [self.setuptools];
                     }
                   );
                   asyncdbus = super.asyncdbus.overridePythonAttrs (
                     old: {
-                        buildInputs = old.buildInputs ++ [ self.setuptools-scm ];
+                      buildInputs = old.buildInputs ++ [self.setuptools-scm];
                     }
                   );
                 }

greendeck/lib/elgato/__init__.py

@@ -1,10 +1,13 @@
 """Elgato StreamDeck Python Library."""
 from enum import IntEnum
+import logging
 
 from greendeck.lib.elgato.streamdeck import StreamDeck
 from greendeck.lib.elgato.streamdeck.original_v2 import StreamDeckOriginalV2
 from greendeck.lib.hidapi.device import enumerate_devices
 
+logger = logging.getLogger(__name__)
+
 
 class VendorIDs(IntEnum):
     """Elgato StreamDeck USB Vendor IDs."""
@@ -31,6 +34,7 @@ async def enumerate_streamdecks() -> list[StreamDeck]:
     streamdecks: list[StreamDeck] = []
 
     for device in await enumerate_devices():
+        logger.info(f"{device.vendor_id:04x} {device.product_id:04x} {device.path}")
         match (device.vendor_id, device.product_id):
             case (
                 VendorIDs.USB_VID_ELGATO,

greendeck/lib/homeassistant/__init__.py

@@ -240,7 +240,7 @@ class HomeAssistant:
         await self.websocket.send(request.json())
 
     async def get_events_callback(self: Self, response: Response) -> None:
-        print(response.result)
+        logger.info(f"{response.result}")
 
     async def websocket_runner(self: Self) -> None:
         while True:
@@ -248,16 +248,15 @@ class HomeAssistant:
                 async with websockets.client.connect(
                     str(self.websocket_url())
                 ) as self.websocket:
-
                     async for message in self.websocket:
                         try:
                             response = parse_raw_as(Response, message)
                             # pprint(response)
                             match response.type:
                                 case "auth_required":
-                                    await self.websocket.send(
+                                    data = AuthRequest(access_token=self.token).json()
-                                        AuthRequest(access_token=self.token).json()
+                                    logger.info(f"authentication data {data}")
-                                    )
+                                    await self.websocket.send(data)
 
                                 case "auth_ok":
                                     t = asyncio.create_task(

pyproject.toml

@@ -5,19 +5,19 @@ description = ""
 authors = ["Jeffrey C. Ollie <jeff@ocjtech.us>"]
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.12"
 pydantic = "<2"
 hyperlink = "^21.0.0"
-websockets = "^11.0.3"
+websockets = "^13.1"
-Pillow = "^10.0.0"
+Pillow = "^11.0.0"
-Wand = "^0.6.11"
+Wand = "^0.6.13"
-aiohttp = "^3.8.5"
+aiohttp = "^3.10.10"
 pydantic-yaml = "<2"
 xdg = "^6.0.0"
-aiopath = "^0.6.11"
+aiopath = "^0.7.7"
-arrow = "^1.2.3"
+arrow = "^1.3.0"
 click = "^8.1.7"
-asyncdbus = "^0.6.1"
+asyncdbus = "^0.7.0"
 
 [tool.poetry.scripts]
 greendeck = "greendeck.main:main"
@@ -36,14 +36,15 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.black]
+line_length = 120
 
 [tool.isort]
 profile = "black"
-line_length = 88
+line_length = 120
 force_single_line = true
 force_sort_within_sections = true
 from_first = false
 
 [tool.flake8]
-max-line-length = 88
+max-line-length = 120
 extend-ignore = "E203"