diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix
index f2a1300a1b5c..1bfa128b34b5 100644
--- a/pkgs/development/python-modules/beanhub-cli/default.nix
+++ b/pkgs/development/python-modules/beanhub-cli/default.nix
@@ -4,28 +4,42 @@
   buildPythonPackage,
   pythonOlder,
   pytestCheckHook,
+
+  # dependencies
   beancount-black,
   beancount-parser,
   beanhub-forms,
   beanhub-import,
   click,
   fastapi,
-  httpx,
   jinja2,
   poetry-core,
-  pydantic,
-  pydantic-core,
   pydantic-settings,
-  pytz,
+  pydantic,
   pyyaml,
   rich,
   starlette-wtf,
   uvicorn,
+
+  # optional-dependencies
+  attrs,
+  cryptography,
+  httpx,
+  pynacl,
+  python-dateutil,
+  tomli-w,
+  tomli,
+
+  # tests
+  pytest,
+  pytest-asyncio,
+  pytest-httpx,
+  pytest-mock,
 }:
 
 buildPythonPackage rec {
   pname = "beanhub-cli";
-  version = "1.4.1";
+  version = "2.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -34,7 +48,7 @@ buildPythonPackage rec {
     owner = "LaunchPlatform";
     repo = "beanhub-cli";
     tag = version;
-    hash = "sha256-ZPRQLdNDp/LOXmxU9H6fh9raPPiDsTiEW3j8ncgt8sY=";
+    hash = "sha256-mGLg6Kgur2LAcujFzO/rkSPAC2t3wR5CO2AeOO0+bFI=";
   };
 
   build-system = [ poetry-core ];
@@ -48,19 +62,38 @@ buildPythonPackage rec {
     fastapi
     jinja2
     pydantic
-    pydantic-core
     pydantic-settings
-    pytz
     pyyaml
     rich
     starlette-wtf
     uvicorn
-  ];
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+
+  optional-dependencies = rec {
+    login = [
+      attrs
+      httpx
+      python-dateutil
+      tomli
+      tomli-w
+    ];
+    connect = [
+      attrs
+      cryptography
+      httpx
+      pynacl
+      python-dateutil
+      tomli
+      tomli-w
+    ];
+  };
 
   nativeCheckInputs = [
+    pytest-asyncio
+    pytest-httpx
+    pytest-mock
     pytestCheckHook
-    httpx
-  ];
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "beanhub_cli" ];
 
diff --git a/pkgs/development/python-modules/beanhub-extract/default.nix b/pkgs/development/python-modules/beanhub-extract/default.nix
index 725444cc411a..4a1857bfdd7e 100644
--- a/pkgs/development/python-modules/beanhub-extract/default.nix
+++ b/pkgs/development/python-modules/beanhub-extract/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "beanhub-extract";
-  version = "0.1.3";
+  version = "0.1.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "LaunchPlatform";
     repo = "beanhub-extract";
     tag = version;
-    hash = "sha256-Uw9bSVOpiIALkgA77OrqAcDWcEafVSnp4iILa4Jkykc=";
+    hash = "sha256-L3TM3scBJGlOXXxeJAkiqMkpBmhJZB6b+IQT2DGIfO0=";
   };
 
   build-system = [ poetry-core ];