fixup user input for conflict resolution; fixup test-uv paths

.gitignore

@@ -48,7 +48,7 @@ share/python-wheels/
 *.spec
 
 # temporary files created by tests
-tests/temp
+tests/temp/
 
 venv/
 

comfy_cli/ui.py

@@ -36,9 +36,33 @@ def show_progress(iterable, total, description="Downloading..."):
 
 ChoiceType = Union[str, Choice, Dict[str, Any]]
 
+def prompt_autocomplete(
+    question: str,
+    choices: List[ChoiceType],
+    default: ChoiceType = "",
+    force_prompting: bool = False
+) -> Optional[ChoiceType]:
+    """
+    Asks a single select question using questionary and returns the selected response.
+
+    Args:
+        question (str): The question to display to the user.
+        choices (List[ChoiceType]): A list of choices the user can autocomplete from.
+        default (ChoiceType): Default choice.
+        force_prompting (bool): Whether to force prompting even if skip_prompting is set.
+
+    Returns:
+        Optional[ChoiceType]: The selected choice from the user, or None if skipping prompts.
+    """
+    if workspace_manager.skip_prompting and not force_prompting:
+        return None
+    return questionary.autocomplete(question, choices=choices, default=default).ask()
+
+
 def prompt_select(
     question: str,
     choices: List[ChoiceType],
+    default: ChoiceType = "",
     force_prompting: bool = False
 ) -> Optional[ChoiceType]:
     """
@@ -47,14 +71,15 @@ def prompt_select(
     Args:
         question (str): The question to display to the user.
         choices (List[ChoiceType]): A list of choices for the user to select from.
+        default (ChoiceType): Default choice.
         force_prompting (bool): Whether to force prompting even if skip_prompting is set.
 
     Returns:
         Optional[ChoiceType]: The selected choice from the user, or None if skipping prompts.
     """
     if workspace_manager.skip_prompting and not force_prompting:
         return None
-    return questionary.select(question, choices=choices).ask()
+    return questionary.select(question, choices=choices, default=default).ask()
 
 
 E = TypeVar('E', bound=Enum)

comfy_cli/uv.py

@@ -143,7 +143,11 @@ def Compile(
                 name, reqs = parseUvCompileError(e.stderr)
                 vers = [req.split(name)[1].strip(",") for req in reqs]
 
-                ver = prompt_select("Please pick one of the conflicting version specs (or pick latest):", vers + ["latest"])
+                ver = prompt_select(
+                    "Please pick one of the conflicting version specs (or pick latest):",
+                    choices=vers + ["latest"],
+                    default=vers[0],
+                )
 
                 if ver == "latest":
                     req = name
@@ -316,7 +320,7 @@ def compileCorePlusExt(self):
                     with open(self.override, "a") as f:
                         f.write(e.req + "\n")
                 else:
-                    raise ValueError
+                    raise AttributeError
 
     def installCorePlusExt(self):
         DependencyCompiler.Install(

tests/uv/mock_requirements/y_reqs.txt

@@ -1,3 +1,3 @@
 numpy<=1.5.0
-sympy>=1.13.1
+sympy>=1.13.0
 tqdm==2.0.0

tests/uv/test_uv.py

@@ -1,11 +1,13 @@
 from pathlib import Path
+import shutil
 
 from comfy_cli.uv import DependencyCompiler
 
 hereDir = Path(__file__).parent.resolve()
 testsDir = hereDir.parent.resolve()
-temp = testsDir / "temp"
-temp.mkdir(exist_ok=True)
+temp = testsDir / "temp" / "test_uv"
+shutil.rmtree(temp, ignore_errors=True)
+temp.mkdir(exist_ok=True, parents=True)
 
 def test_compile():
     depComp = DependencyCompiler(