lcpcli 0.3.1__tar.gz → 0.3.2__tar.gz

{lcpcli-0.3.1 → lcpcli-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: lcpcli
-Version: 0.3.1
+Version: 0.3.2
 Summary: Helper for converting CONLLU files and uploading the corpus to LiRI Corpus Platform (LCP)
 Project-URL: Homepage, https://github.com/liri-uzh/lcpcli
 Project-URL: Issues, https://github.com/liri-uzh/lcpcli/issues

{lcpcli-0.3.1 → lcpcli-0.3.2}/lcpcli/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 
 from .lcpcli import Lcpcli  # noqa: F401

{lcpcli-0.3.1 → lcpcli-0.3.2}/lcpcli/builder.py

@@ -167,6 +167,7 @@ class Corpus:
         revision: int | float = 1,
         url: str = "placeholder",
         license: str | None = None,
+        tmp_dir: str | None = None,
     ):
         self._name = name
         self._document = document
@@ -184,10 +185,11 @@ class Corpus:
         self._url = url
         self._license = license
         self._upperFrameDocument = 0
+        self._tmp_dir = tmp_dir
 
     def _csv_writer(self, fn: str):
         tmp = tempfile.NamedTemporaryFile(
-            "w+", encoding="utf-8", newline="\n", delete=False
+            "w+", encoding="utf-8", newline="\n", delete=False, dir=self._tmp_dir
         )
         self._files[fn] = tmp
         return csv.writer(tmp)

{lcpcli-0.3.1 → lcpcli-0.3.2}/lcpcli/lcp_upload.py

@@ -57,10 +57,25 @@ class CustomUploader(tus_uploader.Uploader):
         if metadata:
             self.metadata = metadata
         self.client.headers.update(headers)
-        self.last_post_headers = None
+        self.last_post_headers = {}
+        self.tqdm = tqdm(
+            total=self.get_file_size(),
+            desc=f"Uploading {self.metadata.get('filename', 'file')}",
+            unit_scale=True,
+            ncols=100,
+            leave=False,
+        )
 
     def _do_request(self):
         super()._do_request()
+        offset = self.get_offset()
+        total_size = self.get_file_size()
+        if offset < total_size:
+            self.tqdm.n = offset
+            self.tqdm.refresh()
+        else:
+            self.tqdm.close()
+            self.tqdm.clear()
         try:
             self.last_post_headers = self.request.response_headers
         except:
@@ -415,7 +430,7 @@ def lcp_upload(
         )
 
     if status != "finished":
-        print(f"Upload failed: {error}")
+        print(f"Upload failed: {status} - {error}")
     else:
         if overwrite_id and overwrite_id > 0:
             status, error_or_job_id = overwrite_corpus(
@@ -524,7 +539,8 @@ def send_media(
             uploader = tus_client.uploader(
                 file_path, chunk_size=1000 * 1024, headers=headers
             )
-            data = uploader.upload()
+            # No request object so no response.headers for 0-bit files: set 'finished' manually
+            data = uploader.upload() or {"x-status": "finished"}
             print(f"✅ Uploaded {file_path} to: {uploader.url}")
     except Exception as e:
         return ("failed", str(e))
@@ -660,17 +676,11 @@ def check_template_and_send(
         )
         data = uploader.upload()
         print(f"✅ Uploaded {file_path} to: {uploader.url}")
-    # resp = post(upload_url, params=jso, headers=headers, files=files, verify=False)  # type: ignore
 
     time.sleep(0.5)
 
     print("Waiting for server checks...")
 
-    # try:
-    #     data = resp.json()
-    # except Exception:
-    #     print("Error", resp)
-
     if "x-target" not in data:
         print(f"Failed:")
         for k, v in data.items():
@@ -686,7 +696,7 @@ def monitor_db_insert(
     new_url: str, headers: dict[str, Any], jso: dict[str, Any]
 ) -> int:
     """
-    Poll /upload and check the status of a job
+    Poll /monitor_db_insert and check the status of a job
     """
     status = None
     wait = 8
@@ -696,7 +706,7 @@ def monitor_db_insert(
     unit: str = "byte"
 
     while True:
-        resp = post(new_url, headers=headers, params=jso)  # type: ignore
+        resp = requests.get(new_url, headers=headers)
         data = resp.json()
 
         if data.get("status") != status and data["status"] not in bads:
@@ -770,9 +780,9 @@ def check_template(
 
     while True:
         if not status or not (elapsed * 10 % wait):
-            url = url.removesuffix("/") + data["target"]
-            cparams = {"job": data["job"], "project": project}
-            resp = post(url, params=cparams, headers=headers)  # type: ignore
+            status_url = url.removesuffix("/") + data["target"]
+            cparams = {"project": project}
+            resp = post(status_url, params=cparams, headers=headers)  # type: ignore
             data = resp.json()
             if data.get("status") != status:
                 print("")