I5 fix classic netcdf subsetting

.github/workflows/python-ci.yml

@@ -4,7 +4,6 @@ on: push
 
 jobs:
   test:
-
     runs-on: ubuntu-22.04
     strategy:
       matrix:
@@ -20,23 +19,23 @@ jobs:
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
-        with: 
+        with:
           python-version: ${{ matrix.python-version }}
 
       - name: Install OS Dependencies
         run: |
           sudo apt update
           sudo apt install python3-dev
-          sudo apt-get install nco
+          sudo apt-get install nco 
           sudo apt-get install curl
 
       - name: Install Poetry
         run: |
           pip install poetry==2.2
-          
+
       - name: Install project
         run: |
           poetry install
 
       - name: Test with pytest
-        run: poetry run pytest
+        run: poetry run pytest

Dockerfile

@@ -2,7 +2,7 @@ FROM python:3.9-slim
 
 RUN apt-get update && apt-get install -y \
     nco \
-    curl
+    curl 
 
 COPY . /app
 WORKDIR /app

ncpartitioner/response.py

@@ -2,7 +2,6 @@
 In cases of DDS and DAS, the file already exists; for data requests the filemust be created first.
 """
 
-from posixpath import dirname
 import subprocess
 import os
 from flask import redirect
@@ -11,15 +10,24 @@
 logger = logging.getLogger(__name__)
 
 
+def input_filepath(args):
+    """Resolve the source file path for the current request."""
+    if "filepath" in args:
+        return os.path.join(args["filepath"], f"{args['basename']}.{args['extension']}")
+    return f"/{args['dirname']}/{args['basename']}.{args['extension']}"
+
+
 def slice(args):
     output_dir = os.getenv("OUTPUT_DIR")
     thredds_base = os.getenv("THREDDS_HTTP_BASE")
+    source_filepath = input_filepath(args)
 
     logger.info(f"Slicing file")
     try:
         subprocess.run(
             [
                 "ncks",
+                "-4",
                 "-v",
                 f"{args['variable']}",
                 "-d",
@@ -28,7 +36,7 @@ def slice(args):
                 f"lat,{args['lat'][0]},{args['lat'][1]}",
                 "-d",
                 f"lon,{args['lon'][0]},{args['lon'][1]}",
-                f"/{args['dirname']}/{args['basename']}.{args['extension']}",
+                source_filepath,
                 os.path.join(
                     output_dir,
                     f"{args['basename']}_{args['timestamp']}.{args['extension']}",

tests/test_sanitize.py

@@ -92,7 +92,7 @@ def test_check_targets(targets, valid, error):
 )
 def test_check_ranges(args, valid, error):
     args["basename"] = "tasmax"
-    dirname = "tests/data/"
+    dirname = "tests/data"
     args["dirname"] = dirname
     args["extension"] = "nc"