Mark packages as user requested

Author: soapy1

dof/_src/checkpoint.py

@@ -8,13 +8,17 @@
 from dof._src.models import package, environment
 from dof._src.utils import hash_string
 from dof._src.data.local import LocalData
+from dof._src.conda_meta.conda_meta import CondaMeta
 
 
 class Checkpoint():
     @classmethod
     def from_prefix(cls, prefix: str, uuid: str, tags: List[str] = []):
         packages = []
         channels = set()
+        meta = CondaMeta(prefix=prefix)
+        user_requested_specs_map = meta.get_requested_specs_map()
+
         for prefix_record in PrefixData(prefix, pip_interop_enabled=True).iter_records_sorted():
             if prefix_record.subdir == "pypi":
                 packages.append(
@@ -36,9 +40,9 @@ def from_prefix(cls, prefix: str, uuid: str, tags: List[str] = []):
                         conda_channel=prefix_record.channel.url(),
                         # TODO
                         arch="",
-                        # not sure here
-                        platform="linux-64",
-                        url=prefix_record.url
+                        platform=prefix_record.channel.platform,
+                        url=prefix_record.url,
+                        user_requested_spec=user_requested_specs_map.get(prefix_record.name, None)
                     )
                 )
 

dof/_src/conda_meta/conda.py

@@ -21,11 +21,24 @@ def __init__(self, prefix):
         self.history = History(prefix)
 
     def get_requested_specs(self) -> list[str]:
-        """Return a list of all the specs a user requested to be installed.
+        """Return a list of all the MatchSpecs a user requested to be installed
+
         Returns
         -------
         specs: list[str]
-            A list of all the specs a user requested to be installed.
+            A list of all the MatchSpecs a user requested to be installed
+        """
+        requested_specs = self.history.get_requested_specs_map()
+        return [spec.spec for spec in requested_specs.values()]
+    
+    def get_requested_specs_map(self) -> dict[str, str]:
+        """Return a dict of all the package name to MatchSpecs user requested
+          specs to be installed.
+
+        Returns
+        -------
+        specs: dict[str, str]
+            A list of all the package names to MatchSpecs a user requested to be installed
         """
         requested_specs = self.history.get_requested_specs_map()
-        return [spec.dist_str() for spec in requested_specs.values()]
+        return {k: v.spec for k,v in requested_specs.items()}

dof/_src/conda_meta/conda_meta.py

@@ -40,7 +40,7 @@ def __init__(self, prefix):
             raise Exception("Could not detect conda or pixi based conda meta")
 
     def get_requested_specs(self) -> list[str]:
-        """Return a list of all the specs a user requested to be installed.
+        """Return a list of all the MatchSpecs a user requested to be installed.
 
         A user_requested_spec is one that the user explicitly asked to be 
         installed. These are different from dependency_specs which are specs
@@ -53,6 +53,17 @@ def get_requested_specs(self) -> list[str]:
         Returns
         -------
         specs: list[str]
-            A list of all the specs a user requested to be installed.
+            A list of all the MatchSpecs a user requested to be installed
         """
         return self.conda_meta.get_requested_specs()
+    
+    def get_requested_specs_map(self) -> dict[str, str]:
+        """Return a dict of all the package name to MatchSpecs user requested
+          specs to be installed.
+
+        Returns
+        -------
+        specs: dict[str, str]
+            A list of all the package names to MatchSpecs a user requested to be installed
+        """
+        return self.conda_meta.get_requested_specs_map()

dof/_src/conda_meta/pixi.py

@@ -24,4 +24,16 @@ def get_requested_specs(self) -> list[str]:
         specs: list[str]
             A list of all the specs a user requested to be installed.
         """
-        return []
+        return []
+    
+    # TODO
+    def get_requested_specs_map(self) -> dict[str, str]:
+        """Return a dict of all the package name to MatchSpecs user requested
+          specs to be installed.
+
+        Returns
+        -------
+        specs: dict[str, str]
+            A list of all the package names to MatchSpecs a user requested to be installed
+        """
+        return {}

dof/_src/models/package.py

@@ -14,6 +14,10 @@ class CondaPackage(BaseModel):
     arch: str
     platform: str
     url: str
+    # the string representation of the matchspec that the user
+    # used to request the package. If this was not a package
+    # the user explicitly added, this will be none.
+    user_requested_spec: Optional[str] = None
 
     def to_repodata_record(self):
         """Converts a url package into a rattler compatible repodata record."""
@@ -28,7 +32,6 @@ def to_repodata_record(self):
             channel=self.conda_channel,
             url=self.url
         )
-        
 
     def __str__(self):
         return f"conda: {self.name} - {self.version}"
@@ -59,6 +62,7 @@ def to_repodata_record(self):
         pass
 
 
+# TODO: probably remove?
 class UrlCondaPackage(BaseModel):
     url: str
 

dof/cli/root.py

@@ -55,15 +55,22 @@ def user_specs(
     ),
 ):
     """Demo command: output the list of user requested specs for a revision"""
+    prefix = os.environ.get("CONDA_PREFIX")
     if rev is None:
-        prefix = os.environ.get("CONDA_PREFIX")
         meta = CondaMeta(prefix=prefix)
         specs = meta.get_requested_specs()
         print("the user requested specs in this environment are:")
-        for spec in specs:
+        # sort alphabetically for readability
+        for spec in sorted(specs):
             print(f"  {spec}")
     else:
-        print("I don't know how to do this yet")
+        chck = Checkpoint.from_uuid(prefix=prefix, uuid=rev)
+        pkgs = chck.list_packages()
+        print(f"the user requested specs rev {rev}:")
+        # sort alphabetically for readability
+        for spec in sorted(pkgs, key=lambda p: p.name):
+            if spec.user_requested_spec is not None:
+                print(f"  {spec.user_requested_spec}")
 
 
 @app.command()