ffx-cli 0.1.0__tar.gz → 0.1.2__tar.gz

{ffx_cli-0.1.0 → ffx_cli-0.1.2}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: ffx-cli
-Version: 0.1.0
+Version: 0.1.2
 Summary: Fireflies.ai CLI
 Requires-Python: >=3.11
 Requires-Dist: gql[httpx]>=3.5
+Requires-Dist: python-dotenv>=1.0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: rich>=13.7
 Requires-Dist: typer>=0.12

{ffx_cli-0.1.0 → ffx_cli-0.1.2}/ffx/config.py

@@ -3,6 +3,7 @@ import stat
 from pathlib import Path
 
 import yaml
+from dotenv import dotenv_values
 
 
 def _ffx_home() -> Path:
@@ -39,7 +40,13 @@ class Config:
 
     @property
     def api_key(self) -> str | None:
-        return os.environ.get("FIREFLIES_API_KEY") or self.get("api_key")
+        env_key = os.environ.get("FIREFLIES_API_KEY")
+        if env_key:
+            return env_key
+        dotenv_key = dotenv_values(".env").get("FIREFLIES_API_KEY")
+        if dotenv_key:
+            return dotenv_key
+        return self.get("api_key")
 
     @property
     def home(self) -> Path:

{ffx_cli-0.1.0 → ffx_cli-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ffx-cli"
-version = "0.1.0"
+version = "0.1.2"
 description = "Fireflies.ai CLI"
 requires-python = ">=3.11"
 dependencies = [
@@ -8,6 +8,7 @@ dependencies = [
     "gql[httpx]>=3.5",
     "rich>=13.7",
     "pyyaml>=6.0",
+    "python-dotenv>=1.0",
 ]
 
 [project.scripts]
@@ -26,5 +27,4 @@ dev = [
     "pytest-cov>=5.0",
     "respx>=0.21",
     "httpx>=0.27",
-    "python-dotenv>=1.2.2",
 ]

{ffx_cli-0.1.0 → ffx_cli-0.1.2}/tests/test_commands/test_auth.py

@@ -6,6 +6,8 @@ runner = CliRunner()
 
 def test_auth_stores_key(tmp_path, monkeypatch):
     monkeypatch.setenv("FFX_HOME", str(tmp_path))
+    monkeypatch.delenv("FIREFLIES_API_KEY", raising=False)
+    monkeypatch.chdir(tmp_path)
     result = runner.invoke(app, ["auth"], input="test-api-key-123\n")
     assert result.exit_code == 0
     assert "API key saved" in result.output
@@ -13,12 +15,16 @@ def test_auth_stores_key(tmp_path, monkeypatch):
 
 def test_auth_empty_key_rejected(tmp_path, monkeypatch):
     monkeypatch.setenv("FFX_HOME", str(tmp_path))
+    monkeypatch.delenv("FIREFLIES_API_KEY", raising=False)
+    monkeypatch.chdir(tmp_path)
     result = runner.invoke(app, ["auth"], input="\n")
     assert result.exit_code == 1
 
 
 def test_auth_shows_confirmation_when_key_exists(tmp_path, monkeypatch):
     monkeypatch.setenv("FFX_HOME", str(tmp_path))
+    monkeypatch.delenv("FIREFLIES_API_KEY", raising=False)
+    monkeypatch.chdir(tmp_path)
     runner.invoke(app, ["auth"], input="first-key\n")
     result = runner.invoke(app, ["auth"], input="y\nnew-key\n")
     assert result.exit_code == 0
@@ -26,6 +32,8 @@ def test_auth_shows_confirmation_when_key_exists(tmp_path, monkeypatch):
 
 def test_auth_key_stored_with_correct_permissions(tmp_path, monkeypatch):
     monkeypatch.setenv("FFX_HOME", str(tmp_path))
+    monkeypatch.delenv("FIREFLIES_API_KEY", raising=False)
+    monkeypatch.chdir(tmp_path)
     runner.invoke(app, ["auth"], input="test-key\n")
     config_file = tmp_path / "config.yaml"
     assert config_file.exists()

{ffx_cli-0.1.0 → ffx_cli-0.1.2}/tests/test_commands/test_get.py

@@ -56,6 +56,8 @@ def test_get_json_mode(tmp_path, monkeypatch):
 
 def test_get_no_api_key(tmp_path, monkeypatch):
     monkeypatch.setenv("FFX_HOME", str(tmp_path))
+    monkeypatch.delenv("FIREFLIES_API_KEY", raising=False)
+    monkeypatch.chdir(tmp_path)
     result = runner.invoke(app, ["get", "abc123"])
     assert result.exit_code == 2
     assert "ffx auth" in result.output

{ffx_cli-0.1.0 → ffx_cli-0.1.2}/tests/test_commands/test_list.py

@@ -75,6 +75,8 @@ def test_list_with_multiple_participants(tmp_path, monkeypatch):
 
 def test_list_no_api_key(tmp_path, monkeypatch):
     monkeypatch.setenv("FFX_HOME", str(tmp_path))
+    monkeypatch.delenv("FIREFLIES_API_KEY", raising=False)
+    monkeypatch.chdir(tmp_path)
     result = runner.invoke(app, ["list"])
     assert result.exit_code == 2
     assert "ffx auth" in result.output

{ffx_cli-0.1.0 → ffx_cli-0.1.2}/tests/test_config.py

@@ -1,3 +1,5 @@
+import os
+
 from ffx.config import Config
 
 
@@ -26,6 +28,8 @@ def test_missing_key_returns_none(tmp_path, monkeypatch):
 
 def test_api_key_property(tmp_path, monkeypatch):
     monkeypatch.setenv("FFX_HOME", str(tmp_path))
+    monkeypatch.delenv("FIREFLIES_API_KEY", raising=False)
+    monkeypatch.chdir(tmp_path)
     config = Config()
     assert config.api_key is None
     config.set("api_key", "sk-abc")
@@ -45,3 +49,34 @@ def test_env_var_used_when_no_config(tmp_path, monkeypatch):
     monkeypatch.setenv("FIREFLIES_API_KEY", "env-key-only")
     config = Config()
     assert config.api_key == "env-key-only"
+
+
+def test_dotenv_file_loaded(tmp_path, monkeypatch):
+    monkeypatch.setenv("FFX_HOME", str(tmp_path))
+    monkeypatch.delenv("FIREFLIES_API_KEY", raising=False)
+    dotenv_file = tmp_path / ".env"
+    dotenv_file.write_text("FIREFLIES_API_KEY=dotenv-key-456\n")
+    monkeypatch.chdir(tmp_path)
+    config = Config()
+    assert config.api_key == "dotenv-key-456"
+
+
+def test_env_var_overrides_dotenv(tmp_path, monkeypatch):
+    monkeypatch.setenv("FFX_HOME", str(tmp_path))
+    monkeypatch.setenv("FIREFLIES_API_KEY", "explicit-env-key")
+    dotenv_file = tmp_path / ".env"
+    dotenv_file.write_text("FIREFLIES_API_KEY=dotenv-key-456\n")
+    monkeypatch.chdir(tmp_path)
+    config = Config()
+    assert config.api_key == "explicit-env-key"
+
+
+def test_dotenv_overrides_config_yaml(tmp_path, monkeypatch):
+    monkeypatch.setenv("FFX_HOME", str(tmp_path))
+    monkeypatch.delenv("FIREFLIES_API_KEY", raising=False)
+    config = Config()
+    config.set("api_key", "yaml-key")
+    dotenv_file = tmp_path / ".env"
+    dotenv_file.write_text("FIREFLIES_API_KEY=dotenv-key-789\n")
+    monkeypatch.chdir(tmp_path)
+    assert config.api_key == "dotenv-key-789"

{ffx_cli-0.1.0 → ffx_cli-0.1.2}/uv.lock

@@ -173,6 +173,7 @@ version = "0.1.0"
 source = { editable = "." }
 dependencies = [
     { name = "gql", extra = ["httpx"] },
+    { name = "python-dotenv" },
     { name = "pyyaml" },
     { name = "rich" },
     { name = "typer" },
@@ -183,13 +184,13 @@ dev = [
     { name = "httpx" },
     { name = "pytest" },
     { name = "pytest-cov" },
-    { name = "python-dotenv" },
     { name = "respx" },
 ]
 
 [package.metadata]
 requires-dist = [
     { name = "gql", extras = ["httpx"], specifier = ">=3.5" },
+    { name = "python-dotenv", specifier = ">=1.0" },
     { name = "pyyaml", specifier = ">=6.0" },
     { name = "rich", specifier = ">=13.7" },
     { name = "typer", specifier = ">=0.12" },
@@ -200,7 +201,6 @@ dev = [
     { name = "httpx", specifier = ">=0.27" },
     { name = "pytest", specifier = ">=8.1" },
     { name = "pytest-cov", specifier = ">=5.0" },
-    { name = "python-dotenv", specifier = ">=1.2.2" },
     { name = "respx", specifier = ">=0.21" },
 ]