Ib py311 fixes

flake.nix

@@ -4,13 +4,20 @@
 # - convert the repo to use poetry using `poetry init`:
 #   https://python-poetry.org/docs/basic-usage/#initialising-a-pre-existing-project
 # - then manually ensuring all deps are converted over:
+# - add this file to the repo and commit it
+# - 
 {
   description = "piker: trading gear for hackers (pkged with poetry2nix)";
 
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
+  # see https://github.com/nix-community/poetry2nix/tree/master#api
   inputs.poetry2nix = {
-    url = "github:nix-community/poetry2nix";
+    # url = "github:nix-community/poetry2nix";
+    # url = "github:K900/poetry2nix/qt5-explicit-deps";
+    url = "/home/lord_fomo/repos/poetry2nix";
+
     inputs.nixpkgs.follows = "nixpkgs";
   };
 
@@ -20,6 +27,7 @@
     flake-utils,
     poetry2nix,
   }:
+    # TODO: build cross-OS and use the `${system}` var thingy..
     flake-utils.lib.eachDefaultSystem (system:
       let
         # use PWD as sources
@@ -30,56 +38,141 @@
         # TODO: port to 3.11 and support both versions?
         python = "python3.10";
 
-        # see https://github.com/nix-community/poetry2nix/tree/master#api
         # for more functions and examples.
         # inherit
         # (poetry2nix.legacyPackages.${system})
         # mkPoetryApplication;
         # pkgs = nixpkgs.legacyPackages.${system};
+
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        lib = pkgs.lib;
+        p2npkgs = poetry2nix.legacyPackages.x86_64-linux;
+
+        # define all pkg overrides per dep, see edgecases.md:
+        # https://github.com/nix-community/poetry2nix/blob/master/docs/edgecases.md
+        # TODO: add these into the json file:
+        # https://github.com/nix-community/poetry2nix/blob/master/overrides/build-systems.json
+        pypkgs-build-requirements = {
+          asyncvnc = [ "setuptools" ];
+          eventkit = [ "setuptools" ];
+          ib-insync = [ "setuptools" "flake8" ];
+          msgspec = [ "setuptools"];
+          pdbp = [ "setuptools" ];
+          pyqt6-sip = [ "setuptools" ];
+          tabcompleter = [ "setuptools" ];
+          tractor = [ "setuptools" ];
+          tricycle = [ "setuptools" ];
+          trio-typing = [ "setuptools" ];
+          trio-util = [ "setuptools" ];
+          xonsh = [ "setuptools" ];
+        };
+
+        # auto-generate override entries
+        p2n-overrides = p2npkgs.defaultPoetryOverrides.extend (self: super:
+          builtins.mapAttrs (package: build-requirements:
+            (builtins.getAttr package super).overridePythonAttrs (old: {
+              buildInputs = (
+                old.buildInputs or [ ]
+              ) ++ (
+                builtins.map (
+                  pkg: if builtins.isString pkg then builtins.getAttr pkg super else pkg
+                  ) build-requirements
+              );
+            })
+          ) pypkgs-build-requirements
+        );
+
+        # override some ahead-of-time compiled extensions
+        # to be built with their wheels.
+        ahot_overrides = p2n-overrides.extend(
+          final: prev: {
+
+            # llvmlite = prev.llvmlite.override {
+            #   preferWheel = false;
+            # };
+
+            # TODO: get this workin with p2n and nixpkgs..
+            # pyqt6 = prev.pyqt6.override {
+            #   preferWheel = true;
+            # };
+
+            # NOTE: this DOESN'T work atm but after a fix
+            # to poetry2nix, it will and actually this line
+            # won't be needed - thanks @k900:
+            # https://github.com/nix-community/poetry2nix/pull/1257
+            pyqt5 = prev.pyqt5.override {
+              withWebkit = false;
+              preferWheel = true;
+            };
 
-      in
-        {
-          # let
-          # devEnv = poetry2nix.mkPoetryEnv {
-          #     projectDir = ./.;
-          # };
+            # see PR from @k900:
+            # https://github.com/nix-community/poetry2nix/pull/1257
+            # pyqt5-qt5 = prev.pyqt5-qt5.override {
+            #   withWebkit = false;
+            #   preferWheel = true;
+            # };
 
+            # TODO: patch in an override for polars to build
+            # from src! See the details likely needed from
+            # the cryptography entry:
+            # https://github.com/nix-community/poetry2nix/blob/master/overrides/default.nix#L426-L435
+            polars = prev.polars.override {
+              preferWheel = true;
+            };
+          }
+      );
+
+      # WHY!? -> output-attrs that `nix develop` scans for:
+      # https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-develop.html#flake-output-attributes
+      in {
           packages = {
-            piker = poetry2nix.mkPoetryEditablePackage {
-            # env = poetry2nix.mkPoetryEnv {
-
-              # NOTE: taken from surrounding inputs
-              # projectDir = projectDir;
-              editablePackageSources = { piker = ./piker; };
-
-              # override msgspec to include setuptools as input
-              # https://github.com/nix-community/poetry2nix/blob/master/docs/edgecases.md#modulenotfounderror-no-module-named-packagenamed
-              overrides = poetry2nix.defaultPoetryOverrides.extend
-                (self: super: {
-                  msgspec = super.msgspec.overridePythonAttrs
-                    (
-                      old: {
-                        buildInputs = (old.buildInputs or [ ]) ++ [ super.setuptools ];
-                      }
-                    );
-                  }
-                );
+            # piker = poetry2nix.legacyPackages.x86_64-linux.mkPoetryEditablePackage {
+            #   editablePackageSources = { piker = ./piker; };
+
+            piker = p2npkgs.mkPoetryApplication {
+              projectDir = projectDir;
 
+              # SEE ABOVE for auto-genned input set, override
+              # buncha deps with extras.. like `setuptools` mostly.
+              # TODO: maybe propose a patch to p2n to show that you
+              # can even do this in the edgecases docs?
+              overrides = ahot_overrides;
+
+              # XXX: won't work on llvmlite..
+              # preferWheels = true;
             };
-        };
+          };
 
+          devShells.default = pkgs.mkShell {
+            # packages = [ poetry2nix.packages.${system}.poetry ];
+            packages = [ poetry2nix.packages.x86_64-linux.poetry ];
+            inputsFrom = [ self.packages.x86_64-linux.piker ];
 
-        # boot xonsh inside the poetry virtualenv when
-        # define the custom entry point via an expected
-        # output-attr that `nix-develop` scans for:
-        # https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-develop.html#flake-output-attributes
-        devShells.default = pkgs.mkShell {
-          # packages = [ poetry2nix.packages.${system}.poetry ];
-          packages = [ poetry2nix.packages.x86_64-linux.poetry ];
-          shellHook = "poetry run xonsh";
-          # shellHook = "poetry shell";
-        };
-      }
-    );
+            # TODO: boot xonsh inside the poetry virtualenv when
+            # defined via a custom entry point?
+            # NOTE XXX: apparently DON'T do these..?
+            # shellHook = "poetry run xonsh";
+            # shellHook = "poetry shell";
+          };
+
+
+          # TODO: grok the difference here..
+          # - avoid re-cloning git repos on every develop entry..
+          # - ideally allow hacking on the src code of some deps
+          #   (tractor, pyqtgraph, tomlkit, etc.) WITHOUT having to
+          #   re-install them every time a change is made.
+
+          # devShells.default = (p2npkgs.mkPoetryEnv {
+          # # let {
+          # #   devEnv = p2npkgs.mkPoetryEnv {
+          #     projectDir = projectDir;
+          #     overrides = ahot_overrides;
+          #     inputsFrom = [ self.packages.x86_64-linux.piker ];
+          #   }).env.overrideAttrs (old: {
+          #       buildInputs = [ packages.piker ];
+          #     }
+          #   );
+
+        }
+    );  # end of .outputs scope
 }

piker/accounting/_pos.py

@@ -543,6 +543,11 @@ def update_from_ledger(
 
             if not (pos := pps.get(bs_mktid)):
 
+                assert isinstance(
+                    mkt,
+                    MktPair,
+                )
+
                 # if no existing pos, allocate fresh one.
                 pos = pps[bs_mktid] = Position(
                     mkt=mkt,

piker/accounting/calc.py

@@ -353,7 +353,7 @@ def open_ledger_dfs(
     can update the ledger on exit.
 
     '''
-    from tractor._debug import open_crash_handler
+    from piker.toolz import open_crash_handler
     with open_crash_handler():
         if not ledger:
             import time

piker/brokers/_daemon.py

@@ -179,9 +179,6 @@ def broker_init(
         subpath: str = f'{modpath}.{submodname}'
         enabled.append(subpath)
 
-        # TODO XXX: DO WE NEED THIS?
-        # enabled.append('piker.data.feed')
-
     return (
         brokermod,
         start_actor_kwargs,  # to `ActorNursery.start_actor()`