materials-commons-cli 2.2.1__py2.py3-none-any.whl → 2.2.2__py2.py3-none-any.whl

materials_commons/cli/__init__.py

@@ -1 +1 @@
-__version__ = '2.2.1'
+__version__ = '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/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.dist-info → materials_commons_cli-2.2.2.dist-info}/METADATA

@@ -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.dist-info → materials_commons_cli-2.2.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
 materials_commons/cli/LICENSE.txt,sha256=wPwCqGrisXnEcpaUxSO79C2mdOUTbtjhLjyy8mVW6p8,1046
-materials_commons/cli/__init__.py,sha256=-7agX4LcQ0956RU4mY0EYyxYQU9llH7JklZOsqoujdU,22
+materials_commons/cli/__init__.py,sha256=jsJ9CNIuUt8dDFB4i0PiBf07nzBU0RtG1CVRQ7TdoQ0,22
 materials_commons/cli/cloned_project.py,sha256=ZsgW7StBQK2o6s-JCfbBRYvaeyPyJRHktQCWiLzDVDs,9367
 materials_commons/cli/exceptions.py,sha256=QUa08womR1N091z0D17mkjVRehPFf44KzoOGJfgCskg,215
 materials_commons/cli/file_functions.py,sha256=Nh4KtJvYCUf25Q_w1yCxC7JYUjdlzUb7vbEtg0gjpmk,5615
 materials_commons/cli/functions.py,sha256=n-9LSmmtAOGd8NlvkHyv_enfKhUqnNlZGCVmo0cO-Xo,28931
 materials_commons/cli/globus.py,sha256=b5QgMUnlOWyDc0iB2UBdVQZ_4w7fwt-EIw2GDqkxLTM,16596
 materials_commons/cli/list_objects.py,sha256=Cjmxteg4LcytubZVN8O8_HA9Zbw_9rSYGnckdhm9AQA,17937
-materials_commons/cli/parser.py,sha256=GK-3TpZ46-cUCxtilCWNDLocZpL66AquqeL2UxIn6ug,7673
+materials_commons/cli/parser.py,sha256=2UISHcQvKXsSYdEhyJ7SrWndOEDGulg7ze-NhcBIXN4,7808
 materials_commons/cli/print_formatter.py,sha256=zELeYEIupcHV31jvqrHkF7RlFgEcHwsv1uDBAZS8bn8,3411
 materials_commons/cli/sqltable.py,sha256=UBMwMZD0qLv4sA3bovdt10YKHGCdkna-clYFqhhH5FU,7033
 materials_commons/cli/tmp_functions.py,sha256=qf7cvg431V3nkuaMvR79QY4OvMWKwhsscGjWsr1VMEM,1577
@@ -24,7 +24,7 @@ materials_commons/cli/desktop/downloader/file_downloader.py,sha256=aIQchvxdj1RHp
 materials_commons/cli/desktop/uploader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 materials_commons/cli/desktop/uploader/api.py,sha256=zdLDpO7L6LKQpAE6AMVzVmMkZFBXyt9uZWsP-Ase8CI,6671
 materials_commons/cli/desktop/uploader/file_transfer_manager.py,sha256=9hM4A0m8aumabAwg9zAIHeridrXLrnrD60d8FN76zLc,8074
-materials_commons/cli/desktop/uploader/file_uploader.py,sha256=h5OTkK1W2tB41SR9OP58L8vk7MJFvrFSF12p0oPDC3A,15545
+materials_commons/cli/desktop/uploader/file_uploader.py,sha256=PMSIst5TMwhQjbRuLqPlyjQZF3Y4pUid6wjfybfgMCE,15965
 materials_commons/cli/subcommands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 materials_commons/cli/subcommands/clone.py,sha256=txhOXoo6aNkJ1UTARXgwSTvRgl3K0GU6-hUTAERDiQA,1132
 materials_commons/cli/subcommands/config.py,sha256=KDaF-5OuXonZiun9wlv_mr97kTcVWdDaYF8nZHmeyTA,1172
@@ -43,9 +43,9 @@ materials_commons/cli/subcommands/rm.py,sha256=SbE0Q7Z6dvD6SWJH4ZxbXm32Qn4XeKl0d
 materials_commons/cli/subcommands/server.py,sha256=2X7lzqnKBiVdVFVUK6fQzt2uFhPsW8t4t0VVbyAbjLE,2702
 materials_commons/cli/subcommands/up.py,sha256=hHCBUXYiELTCQ7jGUZHxDVvm-NDjhHr9YAH2_qGQUjs,9813
 materials_commons/cli/subcommands/versions.py,sha256=rjMdazTGiybfpTTJTlCixvkUC1O5pM1CF0qtlBZ8iws,9938
-materials_commons_cli-2.2.1.dist-info/LICENSE,sha256=rrjezvSS7D1c2hvNFg6BlrCgli8sxqR89C2zA_XIH80,1074
-materials_commons_cli-2.2.1.dist-info/METADATA,sha256=29zvZGVMkWSF6FcuKTT_NBR4kw3ai5lMY3R6nwMDENY,1468
-materials_commons_cli-2.2.1.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
-materials_commons_cli-2.2.1.dist-info/entry_points.txt,sha256=QummyCU7lYlhTMd5_QgAyFu0vBjS3cxRbEhoacmf_q0,58
-materials_commons_cli-2.2.1.dist-info/top_level.txt,sha256=-7hjhx61s4kebg-GGOv1cWWUrj68nye1-oAbjFO53aw,18
-materials_commons_cli-2.2.1.dist-info/RECORD,,
+materials_commons_cli-2.2.2.dist-info/LICENSE,sha256=rrjezvSS7D1c2hvNFg6BlrCgli8sxqR89C2zA_XIH80,1074
+materials_commons_cli-2.2.2.dist-info/METADATA,sha256=AIPfvKc8GkQc3x8kaYv2LcU53fWtMfYAlY-hXRp5oP4,1468
+materials_commons_cli-2.2.2.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
+materials_commons_cli-2.2.2.dist-info/entry_points.txt,sha256=QummyCU7lYlhTMd5_QgAyFu0vBjS3cxRbEhoacmf_q0,58
+materials_commons_cli-2.2.2.dist-info/top_level.txt,sha256=-7hjhx61s4kebg-GGOv1cWWUrj68nye1-oAbjFO53aw,18
+materials_commons_cli-2.2.2.dist-info/RECORD,,