materials-commons-cli 2.2.1__tar.gz → 2.2.2__tar.gz

{materials_commons_cli-2.2.1 → materials_commons_cli-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: materials_commons_cli
-Version: 2.2.1
+Version: 2.2.2
 Summary: Materials Commons CLI
 Home-page: https://materials-commons.github.io/materials-commons-cli/html/index.html
 Author: Materials Commons development team

materials_commons_cli-2.2.2/materials_commons/cli/__init__.py

@@ -0,0 +1 @@
+__version__ = '2.2.2'

{materials_commons_cli-2.2.1 → materials_commons_cli-2.2.2}/materials_commons/cli/desktop/uploader/file_uploader.py

@@ -43,6 +43,7 @@ class FileUploader:
         self.in_flight_chunks = 0
         self.last_acked_chunk = -1
         self._state_lock = asyncio.Lock()
+        self._already_uploaded = False
 
         # Response handling
         self.response_queue: asyncio.Queue = asyncio.Queue()
@@ -59,6 +60,9 @@ class FileUploader:
 
             # Step 2: Wait for acceptance
             if not await self._wait_for_acceptance():
+                if self._already_uploaded:
+                    logger.info(f"File {self.file_path.name} already uploaded")
+                    return True
                 return False
 
             # # Step 3: Send file chunks
@@ -161,7 +165,11 @@ class FileUploader:
 
         elif msg["command"] == "TRANSFER_REJECT":
             reason = msg["payload"].get("reason", "unknown")
-            logger.error(f"Transfer rejected: {reason}")
+            if reason == "file already uploaded":
+                # TODO: This is a hack to prevent uploading the same file twice. We need a better solution.
+                self._already_uploaded = True
+            else:
+                logger.error(f"Transfer rejected: {reason}")
             return False
 
         logger.error(f"Unexpected response: {msg['command']}")

{materials_commons_cli-2.2.1 → materials_commons_cli-2.2.2}/materials_commons/cli/parser.py

@@ -6,7 +6,7 @@ from datetime import datetime, timedelta
 from io import StringIO
 
 import materials_commons.api as mcapi
-import pkg_resources
+from importlib.metadata import PackageNotFoundError, version as pkg_version
 import requests
 
 import materials_commons.cli.functions as clifuncs
@@ -74,8 +74,12 @@ def make_parser():
         description='Materials Commons command line interface',
         usage=usage_help.getvalue())
     parser.add_argument('command', help='Subcommand to run')
-    parser.add_argument('--version', '-v', action='version',
-                        version=pkg_resources.get_distribution('materials-commons-cli').version)
+    package_name = 'materials-commons-cli'
+    try:
+        installed_version = pkg_version(package_name)
+    except PackageNotFoundError:
+        installed_version = "unknown"
+    parser.add_argument('--version', '-v', action='version', version=installed_version)
 
     return parser
 
@@ -113,7 +117,7 @@ def check_package_version():
 
     package_name = 'materials-commons-cli'
     try:
-        current_version = pkg_resources.get_distribution(package_name).version
+        current_version = pkg_version(package_name)
         response = requests.get(f"https://pypi.org/pypi/{package_name}/json")
         latest_version = response.json()["info"]["version"]
 

{materials_commons_cli-2.2.1 → materials_commons_cli-2.2.2}/materials_commons_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: materials-commons-cli
-Version: 2.2.1
+Version: 2.2.2
 Summary: Materials Commons CLI
 Home-page: https://materials-commons.github.io/materials-commons-cli/html/index.html
 Author: Materials Commons development team

materials_commons_cli-2.2.1/materials_commons/cli/__init__.py

@@ -1 +0,0 @@
-__version__ = '2.2.1'