wip

up_ansible/pyproject.toml

@@ -1,12 +1,16 @@
 [tool.poetry]
-name = "up-ansible"
+name = "up_ansible"
 version = "0.1.0"
 description = ""
 authors = ["Julio Faerman <jufaerma@redhat.com>"]
 readme = "README.md"
 
+[project]
+name = "up_ansible"
+
 [tool.poetry.dependencies]
-python = "^3.11"
+python = "^3.12"
+pluggy = "^1.3.0"
 
 
 [build-system]

up_ansible/up_ansible/__init__.py

@@ -0,0 +1,4 @@
+from up_cli import pm
+from up_ansible import image_for_prompt
+
+pm.register(image_for_prompt)

up_ansible/up_ansible/image_for_prompt.py

@@ -0,0 +1,5 @@
+from up_cli import hookimpl, match_prompt
+
+@hookimpl
+def image_for_prompt(prompt):
+    return match_prompt(prompt, "ansible", "cytopia/ansible")

up_cli/pyproject.toml

@@ -5,13 +5,15 @@ description = ""
 authors = ["Julio Faerman <jufaerma@redhat.com>"]
 readme = "README.md"
 packages = [
-    { include = "up_cli", from="./src/"},
-    { include = "up_splat", from="../up_splat"}
+    { include = "up_cli", from="./src/"}
 ]
 
 [tool.poetry.dependencies]
 python = "^3.11"
 pluggy = "^1.3.0"
+docker = "^6.1.3"
+up_ansible = { path = "../up_ansible", develop = true }
+up_splat = { path = "../up_splat", develop = true }
 
 
 [build-system]

up_cli/src/up_cli/__init__.py

@@ -1,4 +1,13 @@
 import pluggy
+from .containers import Containers
 
 hookimpl = pluggy.HookimplMarker("up")
-pm = pluggy.PluginManager("up")
+pm = pluggy.PluginManager("up")
+containers = Containers()
+
+def match_prompt(prompt, head, image):
+    if not prompt:
+        return None
+    if prompt[0] == head:
+        return image
+    return None

up_cli/src/up_cli/containers.py

@@ -0,0 +1,31 @@
+import logging as log
+from dataclasses import dataclass
+import docker
+
+@dataclass
+class ContainerRun:
+    """Specify the parameters for a container run"""
+    image: str
+    prompt: list[str]
+
+
+class DockerContainers:
+    def run(self, run: ContainerRun):
+        log.debug("Running container: %s", run)
+        client = docker.from_env()
+        image = run.image
+        prompt = run.prompt
+        #TODO: Catch errors, print properly
+        result = client.containers.run(
+            image=image, 
+            command=prompt,
+            auto_remove=True)        
+        log.info("container result")
+        log.info("%s", result)
+        log.debug("Container run done")
+
+class Containers:
+    delegate = DockerContainers()
+
+    def run(self, run: ContainerRun):
+        self.delegate.run(run)

up_cli/src/up_cli/defaults/image_for_prompt.py

@@ -1,6 +1,5 @@
 from up_cli import hookimpl
 
-@hookimpl
+
 def image_for_prompt(prompt):
-    print("inside Plugin_1.myhook()")
-    return "-".join(prompt)
+    return "fedora:37"

up_cli/src/up_cli/hookspec.py

@@ -3,7 +3,7 @@
 hookspec = pluggy.HookspecMarker("up")
 
 
-@hookspec
+@hookspec(firstresult=True)
 def image_for_prompt(prompt):
-    """My special little hook that you can customize."""
+    """Present the image in which the prompt will be executed"""
 

up_cli/src/up_cli/main.py

@@ -2,11 +2,9 @@
 import logging as log
 from datetime import datetime
 
-from up_cli import pm
+from up_cli import pm, containers
 from .plugins import load_plugins
-
-
-# from up_splat import *
+from .containers import *
 
 def print_help():
     log.debug("Please please help me")
@@ -49,15 +47,14 @@ def main():
 def start_container(prompt):
     log.info("Starting container")
     log.info("PROMPT IS" + str(type(prompt)) )
-    results = pm.hook.image_for_prompt(prompt=prompt)
-    log.info(results)
-    if len(results) > 1:
-        log.warn("More than one image returned, using first")
-    image = results[0] if results else None
-    print(results)
-
-
-
+    result = pm.hook.image_for_prompt(prompt=prompt)
+    log.info(result)
+    if not result:
+        log.error("No image found for prompt: %s", prompt)
+        exit_cli("NO_IMAGE_FOR_PROMPT")
+    image = result
+    containers.run(ContainerRun(image=image, prompt=prompt))
+    log.info("Container started")
 
 if __name__ == '__main__':
     main()

up_cli/src/up_cli/plugins.py

@@ -13,7 +13,7 @@ def load_plugins(context):
         in pkgutil.iter_modules()
         if name.startswith('up_')
     }
-    log.info("Discovered plugins %s", discovered_plugins)
+    log.info("Discovered %s plugins: %s", len(discovered_plugins), discovered_plugins)
     # create a manager and add the spec
     pm.add_hookspecs(hookspec)
     pm.load_setuptools_entrypoints("up")

up_splat/pyproject.toml

@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "up-splat"
+name = "up_splat"
 version = "0.1.0"
 description = ""
 authors = ["Julio Faerman <jufaerma@redhat.com>"]
@@ -10,13 +10,10 @@ python = "^3.12"
 pluggy = "^1.3.0"
 
 
-# [build-system]
-# requires = ["poetry-core"]
-# build-backend = "poetry.core.masonry.api"
-
 [build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
 
 
 [project]

up_splat/up_splat/__init__.py

@@ -1,6 +1,4 @@
 from up_cli import pm
-
 from up_splat import image_for_prompt
 
-print("-- Registering plugin 2 --")
 pm.register(image_for_prompt)

up_splat/up_splat/image_for_prompt.py

@@ -1,6 +1,5 @@
-from up_cli import hookimpl
+from up_cli import hookimpl, match_prompt
 
 @hookimpl
 def image_for_prompt(prompt):
-    print("inside Plugin_2.myhook()")
-    return "*".join(prompt)
+    return match_prompt(prompt, "splat", "fedora:38")