jvcli 2.0.5__tar.gz → 2.0.7__tar.gz

{jvcli-2.0.5/jvcli.egg-info → jvcli-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jvcli
-Version: 2.0.5
+Version: 2.0.7
 Summary: CLI tool for Jivas Package Repository
 Home-page: https://github.com/TrueSelph/jvcli
 Author: TrueSelph Inc.

{jvcli-2.0.5 → jvcli-2.0.7}/jvcli/__init__.py

@@ -4,5 +4,5 @@ jvcli package initialization.
 This package provides the CLI tool for Jivas Package Repository.
 """
 
-__version__ = "2.0.5"
+__version__ = "2.0.7"
 __supported__jivas__versions__ = ["2.0.0"]

{jvcli-2.0.5 → jvcli-2.0.7}/jvcli/api.py

@@ -57,13 +57,20 @@ class RegistryAPI:
 
     @staticmethod
     def get_package_info(
-        name: str, version: str = "", token: Optional[str] = None
+        name: str,
+        version: str = "",
+        token: Optional[str] = None,
+        api_key: Optional[str] = None,
     ) -> dict:
         """Get action info.yaml content as json"""
         endpoint = "info"
 
         try:
-            headers = {"Authorization": f"Bearer {token}"} if token else None
+            headers = {"Authorization": f"Bearer {token}"} if token else {}
+
+            if api_key:
+                headers["x-api-key"] = api_key
+
             data = {
                 "name": name,
                 "version": "" if version == "latest" else version,
@@ -91,12 +98,16 @@ class RegistryAPI:
         info: bool = False,
         suppress_error: bool = False,
         token: Optional[str] = None,
+        api_key: Optional[str] = None,
     ) -> dict:
         """Download a Jivas Package."""
         endpoint = "download"
 
         try:
-            headers = {"Authorization": f"Bearer {token}"} if token else None
+            headers = {"Authorization": f"Bearer {token}"} if token else {}
+
+            if api_key:
+                headers["x-api-key"] = api_key
 
             data = {
                 "name": name,
@@ -124,13 +135,20 @@ class RegistryAPI:
 
     @staticmethod
     def get_action_info(
-        name: str, version: str = "", token: Optional[str] = None
+        name: str,
+        version: str = "",
+        token: Optional[str] = None,
+        api_key: Optional[str] = None,
     ) -> dict:
         """Get action info.yaml content as json"""
         endpoint = "info"
 
         try:
-            headers = {"Authorization": f"Bearer {token}"} if token else None
+            headers = {"Authorization": f"Bearer {token}"} if token else {}
+
+            if api_key:
+                headers["x-api-key"] = api_key
+
             data = {
                 "name": name,
                 "version": "" if version == "latest" else version,

{jvcli-2.0.5 → jvcli-2.0.7}/jvcli/client/lib/utils.py

@@ -211,8 +211,9 @@ def call_action_walker_exec(
             if args:
                 data["args"] = json.dumps(args)
 
+            file_list = []
+
             if files:
-                file_list = []
 
                 for file in files:
                     file_list.append(("attachments", (file[0], file[1], file[2])))

{jvcli-2.0.5 → jvcli-2.0.7/jvcli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jvcli
-Version: 2.0.5
+Version: 2.0.7
 Summary: CLI tool for Jivas Package Repository
 Home-page: https://github.com/TrueSelph/jvcli
 Author: TrueSelph Inc.

{jvcli-2.0.5 → jvcli-2.0.7}/tests/test_api.py

@@ -197,7 +197,7 @@ class TestRegistryAPI:
         mock_requests.assert_called_once_with(
             RegistryAPI.url + "info",
             params={"name": "test-pkg", "version": "1.0.0"},
-            headers=None,
+            headers={},
         )
         mock_secho.assert_called_once_with(
             "Error retrieving action: Network error", fg="red"
@@ -246,7 +246,7 @@ class TestRegistryAPI:
         mock_requests.assert_called_once_with(
             RegistryAPI.url + "download",
             params={"name": "test-package", "info": "false", "version": "1.0.0"},
-            headers=None,
+            headers={},
         )
         mock_secho.assert_called_once_with(
             "Error downloading package: Network error", fg="red"
@@ -272,7 +272,7 @@ class TestRegistryAPI:
         mock_requests.assert_called_once_with(
             f"{RegistryAPI.url}info",
             params={"name": "test-action", "version": ""},
-            headers=None,
+            headers={},
         )
         assert result == {"name": "test-action", "description": "Test action"}
 
@@ -291,7 +291,7 @@ class TestRegistryAPI:
         mock_requests.assert_called_once_with(
             f"{RegistryAPI.url}info",
             params={"name": "test-action", "version": ""},
-            headers=None,
+            headers={},
         )
         mock_secho.assert_called_once_with(
             "Error retrieving action: Network error", fg="red"
@@ -316,7 +316,7 @@ class TestRegistryAPI:
         mock_requests.assert_called_once_with(
             f"{RegistryAPI.url}info",
             params={"name": "test-action", "version": ""},
-            headers=None,
+            headers={},
         )
         mock_secho.assert_called_once_with(
             "Error retrieving action: Not Found", fg="red"
@@ -742,7 +742,7 @@ class TestRegistryAPI:
         mock_get.assert_called_once_with(
             RegistryAPI.url + "download",
             params={"name": test_name, "info": "false", "version": test_version},
-            headers=None,
+            headers={},
         )
         assert result == {}
 
@@ -947,3 +947,57 @@ class TestRegistryAPI:
 
         # Assert
         assert result == {}
+
+    def test_package_download_with_api_key(self, mocker: MockerFixture) -> None:
+        """Test downloading package with API key."""
+        # Arrange
+        mock_response = mocker.Mock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = {"package": "content"}
+
+        mock_get = mocker.patch("requests.get", return_value=mock_response)
+
+        test_name = "test-action"
+        test_api_key = "test-api-key"  # pragma: allowlist secret
+
+        # Act
+        result = RegistryAPI.download_package(name=test_name, api_key=test_api_key)
+
+        # Assert
+        mock_get.assert_called_once_with(
+            f"{RegistryAPI.url}download",
+            params={"name": test_name, "info": "false", "version": ""},
+            headers={"x-api-key": test_api_key},
+        )
+        assert result == {"package": "content"}
+
+    def test_package_info_with_api_key(self, mocker: MockerFixture) -> None:
+        """Test getting package info with API key."""
+        # Arrange
+        mock_response = mocker.Mock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = {
+            "name": "test-action",
+            "version": "1.0.0",
+            "description": "Test action",
+        }
+
+        mock_get = mocker.patch("requests.get", return_value=mock_response)
+
+        test_name = "test-action"
+        test_api_key = "test-api-key"  # pragma: allowlist secret
+
+        # Act
+        result = RegistryAPI.get_package_info(name=test_name, api_key=test_api_key)
+
+        # Assert
+        mock_get.assert_called_once_with(
+            f"{RegistryAPI.url}info",
+            params={"name": test_name, "version": ""},
+            headers={"x-api-key": test_api_key},
+        )
+        assert result == {
+            "name": "test-action",
+            "version": "1.0.0",
+            "description": "Test action",
+        }