qmenta-sdk-lib 2.1.dev3486__tar.gz → 2.1.dev3487__tar.gz

{qmenta_sdk_lib-2.1.dev3486 → qmenta_sdk_lib-2.1.dev3487}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qmenta-sdk-lib
-Version: 2.1.dev3486
+Version: 2.1.dev3487
 Summary: QMENTA SDK for tool development.
 Author: QMENTA
 Maintainer: Marc Ramos

{qmenta_sdk_lib-2.1.dev3486 → qmenta_sdk_lib-2.1.dev3487}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qmenta-sdk-lib"
-version = "2.1.dev3486"
+version = "2.1.dev3487"
 description = "QMENTA SDK for tool development."
 authors = ["QMENTA"]
 packages = [

{qmenta_sdk_lib-2.1.dev3486 → qmenta_sdk_lib-2.1.dev3487}/python/qmenta/sdk/tool_maker/integration_ui.py

@@ -3,7 +3,7 @@
 import json
 import os
 import re
-from tkinter import filedialog, CENTER, END, messagebox
+from tkinter import filedialog, CENTER, END, LEFT, RIGHT, X, Y, BOTH, YES, HORIZONTAL, TOP, messagebox
 
 import ttkbootstrap as ttk
 from PIL import Image, ImageTk
@@ -50,7 +50,7 @@ def gui_tkinter():
             "image_name": image_name_entry.get(),
             "docker_url": docker_url_entry.get(),
             "docker_user": docker_user_entry.get(),
-            "docker_password": tool_version_entry.get(),
+            "docker_password": docker_password_entry.get(),
         }
         return values
 
@@ -111,162 +111,138 @@ def gui_tkinter():
 
     # window
     window = ttk.Window(themename="darkly")
-    window.resizable(False, True)
-
+    window.resizable(True, True)
     window.title("Tool Publishing GUI")
+    window.geometry("600x800")
+
     write_dir = ttk.StringVar()
 
-    # image
-    logo = Image.open(
-        os.path.join(
-            os.path.dirname(__file__), "templates_tool_maker", "qmenta.png"
-        )
-    ).resize((500, 110))
-    img = ImageTk.PhotoImage(logo)
-    image_label = ttk.Label(master=window, image=img, padding=5, anchor=CENTER)
-    image_label.config(image=img)
-    image_label.pack(side="top")
-
-    # title
-    title_label = ttk.Label(
-        master=window,
-        text="QMENTA Platform credentials.",
-        font="bold",
-    )
-    title_label.pack(padx=10, pady=10)
+    # --- SCROLLBAR & CANVAS SETUP ---
 
-    # title
-    title_label = ttk.Label(
-        master=window, text="(*) indicates mandatory field."
-    )
-    title_label.pack(padx=10, pady=10)
-
-    user_id_frame = ttk.Frame(master=window)
-    user_id_label = ttk.Label(master=user_id_frame, text="Username*")
-    user_id_label.pack(side="left")
-    user_id_entry = ttk.Entry(master=user_id_frame)
-    user_id_entry.pack(side="left", padx=10)
-    user_id_frame.pack(pady=10)
-
-    password_frame = ttk.Frame(master=window)
-    password_label = ttk.Label(master=password_frame, text="Password*")
-    password_label.pack(side="left")
-    password_entry = ttk.Entry(master=password_frame, show="*")
-    password_entry.pack(side="left", padx=10)
-    password_frame.pack(pady=10)
-
-    # Create a button to browse for a folder
-    folder_tool_frame = ttk.Frame(master=window)
-    folder_tool_label = ttk.Label(
-        master=folder_tool_frame,
-        text="Select folder where the tool is stored.*",
-    )
-    folder_tool_label.pack(side="left")
-    folder_tool_button = ttk.Button(
-        master=folder_tool_frame, text="Browse Folder", command=browse_folder
-    )
-    folder_tool_button.pack(side="left", padx=10)
-    folder_label = ttk.Label(master=folder_tool_frame, textvariable=write_dir)
-    folder_label.pack(side="bottom", pady=10)
-    folder_tool_frame.pack(pady=10)
-
-    # input tool ID field
-    tool_id_frame = ttk.Frame(master=window)
-    tool_id_label = ttk.Label(
-        master=tool_id_frame, text="Specify the tool ID.*"
-    )
-    tool_id_label.pack(side="left")
-    tool_id_entry = ttk.Entry(master=tool_id_frame)
-    tool_id_entry.pack(side="left", padx=10)
-    tool_id_frame.pack(pady=10)
-
-    # input tool version field
-    tool_version_frame = ttk.Frame(master=window)
-    tool_version_label = ttk.Label(
-        master=tool_version_frame, text="Specify the tool version.*"
-    )
-    tool_version_label.pack(side="left")
-    tool_version_entry = ttk.Entry(master=tool_version_frame)
-    tool_version_entry.pack(side="left", padx=10)
-    tool_version_frame.pack(pady=10)
-
-    tool_name_frame = ttk.Frame(master=window)
-    tool_name_label = ttk.Label(
-        master=tool_name_frame, text="Specify the tool name.*"
-    )
-    tool_name_label.pack(side="left")
-    tool_name_entry = ttk.Entry(master=tool_name_frame)
-    tool_name_entry.pack(side="left", padx=10)
-    tool_name_frame.pack(pady=10)
-
-    num_cores_frame = ttk.Frame(master=window)
-    num_cores_label = ttk.Label(
-        master=num_cores_frame,
-        text="How many cores does the tool require? (integer, "
-        f"max. {MAX_CORES})",
-    )
-    num_cores_label.pack(side="left")
-    num_cores_entry = ttk.Entry(master=num_cores_frame)
-    num_cores_entry.insert(0, "1")
-    num_cores_entry.pack(side="left", padx=10)
-    num_cores_frame.pack(pady=10)
-
-    memory_frame = ttk.Frame(master=window)
-    memory_label = ttk.Label(
-        master=memory_frame,
-        text=f"How many GB of RAM does the tool require? "
-        f"(integer, max. {MAX_RAM})",
-    )
-    memory_label.pack(side="left")
-    memory_entry = ttk.Entry(master=memory_frame)
-    memory_entry.insert(0, "1")
-    memory_entry.pack(side="left", padx=10)
-    memory_frame.pack(pady=10)
-
-    image_name_frame = ttk.Frame(master=window)
-    image_name_label = ttk.Label(
-        master=image_name_frame, text="Docker image name"
-    )
-    image_name_label.pack(side="left")
-    image_name_entry = ttk.Entry(master=image_name_frame)
-    image_name_entry.pack(side="left", padx=10)
-    image_name_frame.pack(pady=10)
-
-    title_label = ttk.Label(
-        master=window,
-        text="Docker image registry and credentials. "
-        "Credentials need to be valid in order to be able to pull the "
-        "Docker image from the registry.",
-    )
-    title_label.pack(padx=10, pady=10)
+    # Main container to hold canvas and scrollbar
+    main_container = ttk.Frame(window)
+    main_container.pack(fill=BOTH, expand=YES)
+    # Canvas
+    canvas = ttk.Canvas(main_container)
+    # Scrollbar linked to canvas
+    vbar = ttk.Scrollbar(main_container, orient="vertical", command=canvas.yview)
+    canvas.configure(yscrollcommand=vbar.set)
 
-    docker_url_frame = ttk.Frame(master=window)
-    docker_url_label = ttk.Label(
-        master=docker_url_frame, text="Docker registry URL"
-    )
-    docker_url_label.pack(side="left")
-    docker_url_entry = ttk.Entry(master=docker_url_frame)
-    docker_url_entry.insert(0, "hub.docker.com")
-    docker_url_entry.pack(side="left", padx=10)
-    docker_url_frame.pack(pady=10)
-
-    docker_user_frame = ttk.Frame(master=window)
-    docker_user_label = ttk.Label(
-        master=docker_user_frame, text="Docker registry user"
-    )
-    docker_user_label.pack(side="left")
-    docker_user_entry = ttk.Entry(master=docker_user_frame)
-    docker_user_entry.pack(side="left", padx=10)
-    docker_user_frame.pack(pady=10)
-
-    docker_password_frame = ttk.Frame(master=window)
-    docker_password_label = ttk.Label(
-        master=docker_password_frame, text="Docker registry password*"
-    )
-    docker_password_label.pack(side="left")
-    docker_password_entry = ttk.Entry(master=docker_password_frame, show="*")
-    docker_password_entry.pack(side="left", padx=10)
-    docker_password_frame.pack(pady=10)
+    vbar.pack(side=RIGHT, fill=Y)
+    canvas.pack(side=LEFT, fill=BOTH, expand=YES)
+
+    # The actual frame that holds the content
+    content_frame = ttk.Frame(canvas, padding=20)
+    canvas_window_id = canvas.create_window((0, 0), window=content_frame, anchor="nw", tags="inner_frame")
+
+    # --- RESIZE LOGIC ---
+
+    # Update scrollregion when content changes size
+    def configure_scroll_region(event):
+        canvas.configure(scrollregion=canvas.bbox("all"))
+
+    content_frame.bind("<Configure>", configure_scroll_region)
+
+    # Force the inner frame to match the canvas width (Horizontal Fill)
+    def on_canvas_resize(event):
+        canvas.itemconfig(canvas_window_id, width=event.width)
+
+    canvas.bind("<Configure>", on_canvas_resize)
+
+    def _on_mousewheel_windows(event):
+        # Windows/macOS: event.delta is usually multiples of 120
+        # We divide by 120 to get the number of "steps"
+        canvas.yview_scroll(int(-1 * (event.delta / 120)), "units")
+
+    def _on_linux_scroll_up(event):
+        # Linux (X11) often sends Button-4 for scroll up
+        canvas.yview_scroll(-1, "units")
+
+    def _on_linux_scroll_down(event):
+        # Linux (X11) often sends Button-5 for scroll down
+        canvas.yview_scroll(1, "units")
+
+    # Bind Standard MouseWheel (Windows/macOS)
+    window.bind_all("<MouseWheel>", _on_mousewheel_windows)
+    # Bind Linux specific buttons (X11)
+    window.bind_all("<Button-4>", _on_linux_scroll_up)
+    window.bind_all("<Button-5>", _on_linux_scroll_down)
+
+    # --- WIDGETS ---
+
+    # Logo Image
+    try:
+        # Adjusted path logic for safety
+        img_path = os.path.join(os.path.dirname(__file__), "templates_tool_maker", "qmenta.png")
+        if os.path.exists(img_path):
+            logo = Image.open(img_path).resize((500, 110))
+            img = ImageTk.PhotoImage(logo)
+            image_label = ttk.Label(master=content_frame, image=img, anchor=CENTER)
+            image_label.image = img  # Keep reference
+            image_label.pack(side=TOP, pady=(0, 20))
+    except Exception as e:
+        print(f"Image load failed: {e}")
+
+    # Title
+    ttk.Label(
+        master=content_frame,
+        text="QMENTA Platform credentials",
+        font="Helvetica 16 bold",
+    ).pack(pady=10)
+
+    ttk.Label(
+        master=content_frame,
+        text="(*) indicates mandatory field.",
+        bootstyle="warning"
+    ).pack(pady=(0, 20))
+
+    # Helper to create rows easily
+    def create_row(parent, label_text, is_password=False, default=None):
+        frame = ttk.Frame(master=parent)
+        frame.pack(fill=X, pady=5)
+
+        lbl = ttk.Label(master=frame, text=label_text, width=30)
+        lbl.pack(side=LEFT)
+
+        entry = ttk.Entry(master=frame, show="*" if is_password else None)
+        if default:
+            entry.insert(0, str(default))
+        entry.pack(side=LEFT, fill=X, expand=YES, padx=10)
+        return entry
+
+    # User inputs
+    user_id_entry = create_row(content_frame, "Username*")
+    password_entry = create_row(content_frame, "Password*", is_password=True)
+
+    # Browse Folder Row
+    folder_frame = ttk.Frame(master=content_frame)
+    folder_frame.pack(fill=X, pady=10)
+    ttk.Label(folder_frame, text="Select tool folder*", width=30).pack(side=LEFT)
+    ttk.Button(folder_frame, text="Browse Folder", command=browse_folder).pack(side=LEFT, padx=10)
+    ttk.Label(folder_frame, textvariable=write_dir).pack(side=LEFT, padx=10)
+
+    # Tool info
+    tool_id_entry = create_row(content_frame, "Specify the tool ID.*")
+    tool_version_entry = create_row(content_frame, "Specify the tool version.*")
+    tool_name_entry = create_row(content_frame, "Specify the tool name.*")
+    num_cores_entry = create_row(content_frame, f"Cores required (integer, max {MAX_CORES})", default="1")
+    memory_entry = create_row(content_frame, f"RAM required GB (integer, max {MAX_RAM})", default="1")
+    image_name_entry = create_row(content_frame, "Docker image name")
+
+    # Separator
+    ttk.Separator(content_frame, orient=HORIZONTAL).pack(fill=X, pady=20)
+
+    # Docker registry
+    ttk.Label(
+        master=content_frame,
+        text="Docker Registry Credentials",
+        font="Helvetica 12 bold"
+    ).pack(pady=10)
+    docker_url_entry = create_row(content_frame, "Docker registry URL", default="hub.docker.com")
+    docker_user_entry = create_row(content_frame, "Docker registry user")
+    docker_password_entry = create_row(content_frame, "Docker registry password*", is_password=True)
+
+    # --- ACTIONS ---
 
     gui_content = {}
 
@@ -276,15 +252,14 @@ def gui_tkinter():
         if gui_content:
             window.destroy()
 
-    action_frame = ttk.Frame(master=window)
-    button = ttk.Button(
+    action_frame = ttk.Frame(master=content_frame)
+    action_frame.pack(pady=30)
+    ttk.Button(
         master=action_frame,
         text="Publish in QMENTA Platform",
         command=submit_form,
         bootstyle="primary",
-    )
-    button.pack(side="left")
-    action_frame.pack(pady=10)
+    ).pack(side=LEFT, pady=10)
 
     def quit_tool_creator():
         window.destroy()
@@ -296,7 +271,7 @@ def gui_tkinter():
         text="Quit",
         command=quit_tool_creator,
         bootstyle="danger",
-    ).pack(side="left", padx=10)
+    ).pack(side=LEFT, padx=10)
 
     # run
     window.mainloop()