Merge pull request #33 from chriscarrollsmith/fix/32-upload-response-parsing

Fix upload response parsing AttributeError

Author: chriscarrollsmith

.github/workflows/publish.yml

@@ -9,13 +9,45 @@ permissions:
   contents: read
 
 jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10", "3.13"]
+        os: [ubuntu-latest]
+    defaults:
+      run:
+        shell: bash
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies and run tests
+        env:
+          ZOTERO_API_KEY: ${{ secrets.ZOTERO_API_KEY }}
+          ZOTERO_LIBRARY_ID: ${{ secrets.ZOTERO_LIBRARY_ID }}
+          ZOTERO_LIBRARY_TYPE: ${{ secrets.ZOTERO_LIBRARY_TYPE }}
+          ZOTERO_USERNAME: ${{ secrets.ZOTERO_USERNAME }}
+          ZOTERO_TEST_GROUP_ID: ${{ secrets.ZOTERO_TEST_GROUP_ID }}
+        run: |
+          uv sync
+          uv run pytest tests
+
   release:
+    needs: test
     runs-on: ubuntu-latest
     environment:
       name: pypi
     steps:
       - uses: actions/checkout@v4
-      
+
       - name: Install uv
         uses: astral-sh/setup-uv@v5
 
@@ -34,4 +66,3 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           packages-dir: dist/
-

.github/workflows/test.yml

@@ -0,0 +1,55 @@
+name: test
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10", "3.13"]
+        os: [ubuntu-latest]
+    defaults:
+      run:
+        shell: bash
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies and verify package builds
+        run: |
+          uv sync
+          uv run python -c "import pyzotero_cli; print('Import OK')"
+
+  integration-test:
+    runs-on: ubuntu-latest
+    environment: test
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      - name: Install dependencies and run integration tests
+        env:
+          ZOTERO_API_KEY: ${{ secrets.ZOTERO_API_KEY }}
+          ZOTERO_LIBRARY_ID: ${{ secrets.ZOTERO_LIBRARY_ID }}
+          ZOTERO_LIBRARY_TYPE: ${{ secrets.ZOTERO_LIBRARY_TYPE }}
+          ZOTERO_USERNAME: ${{ secrets.ZOTERO_USERNAME }}
+          ZOTERO_TEST_GROUP_ID: ${{ secrets.ZOTERO_TEST_GROUP_ID }}
+        run: |
+          uv sync
+          uv run pytest tests -v

.gitignore

@@ -17,6 +17,3 @@ __pycache__/
 *.egg-info/
 repomix-output.*
 dist/
-
-# temporarily ignored till mock implementation is done
-.github/workflows/test.yml

pyzotero_cli/file_cmds.py

@@ -89,12 +89,10 @@ def upload_files(ctx, paths_to_local_file, parent_item_id, filename_option):
         if response:
             click.echo("Upload results:")
             if 'success' in response and response['success']:
-                # attachment_simple/both success value is a dict {index: {details}}
-                for _index, details in response['success'].items(): 
-                    # Use filename from details if available, fallback to index as key placeholder
+                for details in response['success']:
                     click.echo(f"  Successfully uploaded: {details.get('filename', '?')} (Key: {details.get('key', '?')})")
             if 'failure' in response and response['failure']:
-                for _index, details in response['failure'].items():
+                for details in response['failure']:
                     click.echo(f"  Failed to upload: {details.get('filename', '?')}. Reason: {details.get('message', 'Unknown error')}", err=True)
             if 'unchanged' in response and response['unchanged']:
                 # unchanged value is a list of dicts [{details}]

tests/test_item_cmds.py

@@ -5,7 +5,7 @@
 import uuid
 
 # Test for `zot items list`
-def test_item_list_default_json_output(runner: CliRunner):
+def test_item_list_default_json_output(runner: CliRunner, active_profile_with_real_credentials):
     """Test `zot items list` returns JSON by default and is not empty."""
     result = runner.invoke(zot, ['items', 'list', '--limit', '1'])
     assert result.exit_code == 0
@@ -19,7 +19,7 @@ def test_item_list_default_json_output(runner: CliRunner):
     except json.JSONDecodeError:
         pytest.fail("Output was not valid JSON.")
 
-def test_item_list_top_flag(runner: CliRunner):
+def test_item_list_top_flag(runner: CliRunner, active_profile_with_real_credentials):
     """Test `zot items list --top`."""
     result = runner.invoke(zot, ['items', 'list', '--top', '--limit', '1'])
     assert result.exit_code == 0
@@ -29,7 +29,7 @@ def test_item_list_top_flag(runner: CliRunner):
     except json.JSONDecodeError:
         pytest.fail("Output was not valid JSON for --top flag.")
 
-def test_item_list_output_table(runner: CliRunner):
+def test_item_list_output_table(runner: CliRunner, active_profile_with_real_credentials):
     """Test `zot items list --output table`."""
     result = runner.invoke(zot, ['items', 'list', '--limit', '1', '--output', 'table'])
     assert result.exit_code == 0
@@ -71,7 +71,7 @@ def test_item_get_single_item(runner: CliRunner, temp_item_with_tags):
     except json.JSONDecodeError:
         pytest.fail("Output was not valid JSON for item get.")
 
-def test_item_get_non_existent_item(runner: CliRunner):
+def test_item_get_non_existent_item(runner: CliRunner, active_profile_with_real_credentials):
     """Test `zot items get <item_key>` for a non-existent item."""
     non_existent_key = "NONEXIST" # A key that is unlikely to exist
     result = runner.invoke(zot, ['items', 'get', non_existent_key])
@@ -478,7 +478,7 @@ def test_item_children(runner: CliRunner, zot_instance):
             print(f"Error cleaning up parent item {parent_item_key}: {e_parent}")
 
 # Test for `items count`
-def test_item_count(runner: CliRunner):
+def test_item_count(runner: CliRunner, active_profile_with_real_credentials):
     """Test `zot items count`."""
     result = runner.invoke(zot, ['items', 'count'])
     assert result.exit_code == 0

tests/test_tag_cmds.py

@@ -128,7 +128,7 @@ def test_list_item_tags_json_output(temp_item_with_tags, runner: CliRunner):
     except json.JSONDecodeError:
         pytest.fail(f"Output was not valid JSON: {result.output}")
 
-def test_list_item_tags_non_existent_item(runner: CliRunner):
+def test_list_item_tags_non_existent_item(runner: CliRunner, active_profile_with_real_credentials):
     non_existent_key = f"NONEXISTENTKEY{uuid.uuid4()}" # Ensure truly non-existent
     result = runner.invoke(zot, ['tags', 'list-for-item', non_existent_key])
     assert result.exit_code == 1 # Should exit 1 for "not found" errors
@@ -229,7 +229,7 @@ def test_delete_tag_no_interaction_flag(temp_tag_in_library, zot_instance, runne
     assert "Are you sure you want to delete" not in result.output # Prompt should be skipped
     assert tag_to_delete not in zot_api_client.tags()
 
-def test_delete_non_existent_tag_force(runner: CliRunner):
+def test_delete_non_existent_tag_force(runner: CliRunner, active_profile_with_real_credentials):
     non_existent_tag = f"non-existent-tag-{uuid.uuid4()}"
     result = runner.invoke(zot, ['tags', 'delete', non_existent_tag, '--force'])
     assert result.exit_code == 0