fix: hugr encoding (#147)

Author: vanyae-cqc

.github/workflows/ci.yml

@@ -19,12 +19,12 @@ jobs:
         action: ['lint', 'type', 'format']
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: '0'
 
       - name: Cache poetry
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pypoetry/virtualenvs
           key: ${{ runner.os }}-${{ matrix.python-version }}-poetry-${{ hashFiles('**/poetry.lock') }}
@@ -71,12 +71,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: '0'
 
       - name: Cache poetry
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pypoetry/virtualenvs
           key: ${{ runner.os }}-${{ matrix.python-version }}-poetry-${{ hashFiles('**/poetry.lock') }}

.github/workflows/integration.yml

@@ -19,9 +19,9 @@ jobs:
       matrix:
         python-version: ['3.10', '3.11']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Cache poetry
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pypoetry/virtualenvs
           key: ${{ runner.os }}-${{ matrix.python-version }}-poetry-${{ hashFiles('**/poetry.lock') }}
@@ -62,14 +62,14 @@ jobs:
           pr-number: ${{ github.event.inputs.pr_number }}
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: '0'
           # Use the pull request merge commit ref if one is provided
           ref: ${{ github.event.inputs.pr_number && format('refs/pull/{0}/merge', github.event.inputs.pr_number) || 'main' }}
 
       - name: Cache poetry
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pypoetry/virtualenvs
           key: ${{ runner.os }}-${{ matrix.python-version }}-poetry-${{ hashFiles('**/poetry.lock') }}

devenv.lock

@@ -31,10 +31,31 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742058297,
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
-          "pre-commit-hooks",
+          "git-hooks",
           "nixpkgs"
         ]
       },
@@ -66,32 +87,14 @@
         "type": "github"
       }
     },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737465171,
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "devenv": "devenv",
+        "git-hooks": "git-hooks",
         "nixpkgs": "nixpkgs",
-        "pre-commit-hooks": "pre-commit-hooks"
+        "pre-commit-hooks": [
+          "git-hooks"
+        ]
       }
     }
   },

qnexus/client/hugr.py

@@ -175,7 +175,9 @@ def upload(
     project = cast(ProjectRef, project)
 
     attributes = {
-        "contents": str(base64.b64encode(bytes(hugr_package.to_json(), "utf-8")))
+        "contents": base64.b64encode(bytes(hugr_package.to_json(), "utf-8")).decode(
+            "utf-8"
+        )
     }
 
     annotations = CreateAnnotations(
@@ -287,15 +289,7 @@ def _fetch_hugr_package(handle: HUGRRef) -> Package:
     if res.status_code != 200:
         raise qnx_exc.ResourceFetchFailed(message=res.text, status_code=res.status_code)
 
-    hugr_base_64_bytes = res.json()["data"]["attributes"]["contents"]
-    encoded_bytes = hugr_base_64_bytes.strip()
-    # remove leading b'
-    encoded_bytes = encoded_bytes[1:]
-    # add a trailing '='
-    encoded_bytes += "="
-
-    # Step 2: Decode the base64 bytes back into the original bytes
-    # Step 3: Convert the bytes back into the original string
-    decoded_hugr_str = base64.b64decode(encoded_bytes).decode("utf-8")
+    contents: str = res.json()["data"]["attributes"]["contents"]
+    decoded_hugr_str = base64.b64decode(contents).decode("utf-8")
 
     return Package.from_json(decoded_hugr_str)