materials-commons-cli 2.3.0b5__tar.gz → 2.3.0b7__tar.gz

{materials_commons_cli-2.3.0b5 → materials_commons_cli-2.3.0b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: materials_commons_cli
-Version: 2.3.0b5
+Version: 2.3.0b7
 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.3.0b7/materials_commons/cli/__init__.py

@@ -0,0 +1 @@
+__version__ = '2.3.0b7'

{materials_commons_cli-2.3.0b5 → materials_commons_cli-2.3.0b7}/materials_commons/cli/async_reconciler.py

@@ -45,6 +45,7 @@ class AsyncReconciler:
             # Go through all the observations and match to the file records
             for obs in observations:
                 obs.file_record = file_records_map.get(obs.name, None)
+                obs.remote_path = remote_dir / obs.name
                 path_states[obs.name] = FileState(observation=obs)
 
             results = await asyncio.gather(

{materials_commons_cli-2.3.0b5 → materials_commons_cli-2.3.0b7}/materials_commons/cli/downloader.py

@@ -1,4 +1,5 @@
 import logging
+import traceback
 from pathlib import Path
 
 from igittigitt import IgnoreParser, igittigitt
@@ -45,13 +46,7 @@ class Downloader:
         try:
             for path in paths:
                 p = Path(path)
-                if p.is_dir():
-                    # Walk and download local dir
-                    await self._download_dir(p, recursive=recursive)
-                elif p.is_file():
-                    # Download local file
-                    await self._download_file(p)
-                else:
+                if not p.exists():
                     # If we are here, then the path entry is a remote path. We look up the path to
                     # determine the type of download to perform.
                     remote_path = self.proj.to_remote_path(p)
@@ -71,9 +66,16 @@ class Downloader:
                     else:
                         # Remote entry is a file
                         await self._download_file(p, force=force)
+                elif p.is_dir():
+                    # Walk and download local dir
+                    await self._download_dir(p, recursive=recursive)
+                elif p.is_file():
+                    # Download local file
+                    await self._download_file(p)
 
         except Exception as e:
             logger.error(f"Unexpected error during download: {e}")
+            traceback.print_exc()
             return False
 
         finally:

{materials_commons_cli-2.3.0b5 → materials_commons_cli-2.3.0b7}/materials_commons/cli/server/downloader/file_downloader.py

@@ -12,6 +12,7 @@ import requests
 
 from materials_commons.cli.old.functions import checksum
 from materials_commons.cli.requests import DownloadRequest, DBWriteRequest
+from materials_commons.cli.server import projects
 
 logger = logging.getLogger(__name__)
 
@@ -32,7 +33,10 @@ class FileDownloader:
         self.db_write_queue = db_write_queue
         self.download_request = download_request
         self.file_id = download_request.observation.remote_entry.remote_file_id
-        self.file_path = download_request.observation.local_path
+        if download_request.observation.local_path is None:
+            self.file_path = projects.remote_to_local_project_path(download_request.project.local_path, download_request.observation.remote_path)
+        else:
+            self.file_path = download_request.observation.local_path
         self.base_url = download_request.project.remote.base_url
         self.apitoken = download_request.project.remote.apikey
         self.project_id = download_request.project.id

{materials_commons_cli-2.3.0b5 → materials_commons_cli-2.3.0b7}/materials_commons/cli/server/projects.py

@@ -133,13 +133,16 @@ def local_to_remote_project_path(proj_base: Path, full_path: Path) -> Path:
     Returns:
         Path: The remote path corresponding to the local path.
     """
-    full_path = full_path.resolve()
-    # remote_path will be the relative path from proj_base to full_path, i.e., it
-    # won't start with a slash, so we need to add one to get the correct path.
-    if full_path.as_posix() == proj_base.as_posix():
-        return Path("/")
-    remote_path = full_path.relative_to(proj_base)
-    return Path("/" + remote_path.as_posix())
+    try:
+        full_path_resolved = full_path.resolve()
+        # remote_path will be the relative path from proj_base to full_path, i.e., it
+        # won't start with a slash, so we need to add one to get the correct path.
+        if full_path_resolved.as_posix() == proj_base.as_posix():
+            return Path("/")
+        remote_path = full_path_resolved.relative_to(proj_base)
+        return Path("/" + remote_path.as_posix())
+    except ValueError:
+        return full_path
 
 
 def remote_to_local_project_path(proj_base: Path, remote_path: Path) -> Path:

{materials_commons_cli-2.3.0b5 → materials_commons_cli-2.3.0b7}/materials_commons/cli/server/uploader/file_uploader.py

@@ -74,6 +74,7 @@ class FileUploader:
             if not await self._wait_for_acceptance():
                 if self._already_uploaded:
                     logger.info(f"File {self.file_path} already uploaded")
+                    print(f"Uploaded {self.file_path}...")
                     return True
                 return False
 

{materials_commons_cli-2.3.0b5 → materials_commons_cli-2.3.0b7}/materials_commons/cli/subcommands/ls2.py

@@ -90,21 +90,26 @@ async def ls2_subcommand_async(args, working_dir):
     async_reconciler = AsyncReconciler(db=db, proj=proj, reconcile_mode="status")
     which_class = LSAction if args.action else LSEntry
     listdir_fn = make_merged_listdir_func(proj)
-    for path in args.paths:
-        lstable = LSTable()
-        p = Path(path)
-        if p.is_dir():
-            async for current_path, path_entries in async_reconciler.walk(path=path, listdir_fn=listdir_fn,
-                                                                          recursive=False, ignore_fn=None):
-                for entry_name in sorted(path_entries):
-                    entry = path_entries[entry_name]
-                    if entry.exception:
-                        print(f"Error reconciling file: {entry.exception}")
-                        continue
-                    lstable.add_row(which_class.from_file_state(entry))
-                lstable.print_table()
-        elif p.is_file():
-            state = await async_reconciler.reconcile_file(p)
+    try:
+        for path in args.paths:
             lstable = LSTable()
-            lstable.add_row(which_class.from_file_state(state))
-            lstable.print_table()
+            p = Path(path)
+            if p.is_dir():
+                async for current_path, path_entries in async_reconciler.walk(path=path, listdir_fn=listdir_fn,
+                                                                              recursive=False, ignore_fn=None):
+                    for entry_name in sorted(path_entries):
+                        entry = path_entries[entry_name]
+                        if entry.exception:
+                            print(f"Error reconciling file: {entry.exception}")
+                            continue
+                        lstable.add_row(which_class.from_file_state(entry))
+                    lstable.print_table()
+            elif p.is_file():
+                state = await async_reconciler.reconcile_file(p)
+                lstable = LSTable()
+                lstable.add_row(which_class.from_file_state(state))
+                lstable.print_table()
+    except Exception as e:
+        pass
+    finally:
+        await db.close()

{materials_commons_cli-2.3.0b5 → materials_commons_cli-2.3.0b7}/materials_commons/cli/walk.py

@@ -118,26 +118,30 @@ async def local_listdir(path: str | Path) -> list[Observation]:
     def _scan() -> list[Observation]:
         items: list[Observation] = []
 
-        for entry in root.iterdir():
-            local = path_to_local_file_entry(entry)
-
-            items.append(
-                Observation(
-                    local_path=entry,
-                    remote_path=None,
-                    local_entry=local,
-                    file_record=None,
-                    remote_entry=None,
+        try:
+            for entry in root.iterdir():
+                local = path_to_local_file_entry(entry)
+
+                items.append(
+                    Observation(
+                        local_path=entry,
+                        remote_path=None,
+                        local_entry=local,
+                        file_record=None,
+                        remote_entry=None,
+                    )
                 )
-            )
-
-        return items
+        except:
+            pass
+        finally:
+            return items
 
     return await asyncio.to_thread(_scan)
 
 
 def mcapi_file_to_remote_file_entry(entry: mcmodel.File) -> RemoteFileEntry:
     kind: EntryKind = "dir" if entry.mime_type == "directory" else "file"
+    print(f"mcapi_file_to_remote_file_entry called for entry: {entry.mime_type}, {entry.name}, {entry.directory.path}")
     remote_entry = RemoteFileEntry(
         path=Path(entry.directory.path) / entry.name,
         name=entry.name,
@@ -159,6 +163,7 @@ async def remote_listdir(project_path: str | Path, proj: OldLocalProject) -> lis
         project_path: The path within the project to list directory contents of.
         proj: The local project object representing the remote project.
     """
+    print(f"remote_listdir called for project_path: {project_path}, proj: {proj}")
     entries = await asyncio.to_thread(proj.remote.list_directory_by_path, proj.id, project_path.as_posix())
     items: list[Observation] = []
     for entry in entries:
@@ -201,7 +206,9 @@ async def merged_local_remote_listdir(
     """
     Merge local and remote directory listings, prioritizing local entries.
     """
+    print(f"merged_local_remote_listdir {proj.local_path}, {path}")
     local_entries = await local_listdir_fn(path)
+
     project_path = projects.local_to_remote_project_path(Path(proj.local_path), path)
     remote_entries = await remote_listdir_fn(project_path)
 

{materials_commons_cli-2.3.0b5 → materials_commons_cli-2.3.0b7}/materials_commons_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: materials-commons-cli
-Version: 2.3.0b5
+Version: 2.3.0b7
 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.3.0b5/materials_commons/cli/__init__.py

@@ -1 +0,0 @@
-__version__ = '2.3.0b5'