diff --git a/poetry.lock b/poetry.lock index 6165883..a2d3ca4 100644 --- a/poetry.lock +++ b/poetry.lock @@ -652,21 +652,6 @@ files = [ [package.dependencies] colorama = {version = "*", markers = "platform_system == \"Windows\""} -[[package]] -name = "cmdkit" -version = "2.7.5" -description = "A command-line utility toolkit for Python." -optional = false -python-versions = "<4.0,>=3.8" -files = [ - {file = "cmdkit-2.7.5-py3-none-any.whl", hash = "sha256:1562e4fc40cba195afe62478b51bac0988896851d5eca45335421131df9698fa"}, - {file = "cmdkit-2.7.5.tar.gz", hash = "sha256:b7bf4a9b8cc5737eb5e16ac8675c9edcf0ddd99b0b9aa7672a3fb2694f44ca12"}, -] - -[package.dependencies] -pyyaml = ">=6.0.1,<7.0.0" -toml = ">=0.10.2,<0.11.0" - [[package]] name = "colorama" version = "0.4.6" @@ -2666,20 +2651,6 @@ rtd = ["ipython", "pydata-sphinx-theme (==v0.13.0rc4)", "sphinx-autodoc2 (>=0.4. testing = ["beautifulsoup4", "coverage[toml]", "pytest (>=7,<8)", "pytest-cov", "pytest-param-files (>=0.3.4,<0.4.0)", "pytest-regressions", "sphinx-pytest"] testing-docutils = ["pygments", "pytest (>=7,<8)", "pytest-param-files (>=0.3.4,<0.4.0)"] -[[package]] -name = "names-generator" -version = "0.2.0" -description = "Clone of the Moby/Docker random name generator as a Python package." -optional = false -python-versions = "*" -files = [ - {file = "names_generator-0.2.0-py3-none-any.whl", hash = "sha256:693e8e48e9a54a2a8f714b01d1bd70945743a15d4587059e7e4e16efc361be11"}, - {file = "names_generator-0.2.0.tar.gz", hash = "sha256:de60e354b8ca8f2d1ce0816079d3ba569417371867b94328021f03c9dd47a5be"}, -] - -[package.dependencies] -cmdkit = ">=2.7.4" - [[package]] name = "nbclient" version = "0.10.0" @@ -2854,8 +2825,8 @@ files = [ [package.dependencies] numpy = [ - {version = ">=1.26.0", markers = "python_version >= \"3.12\""}, {version = ">=1.23.2", markers = "python_version == \"3.11\""}, + {version = ">=1.26.0", markers = "python_version >= \"3.12\""}, ] python-dateutil = ">=2.8.2" pytz = ">=2020.1" @@ -3492,8 +3463,8 @@ files = [ astroid = ">=3.3.4,<=3.4.0-dev0" colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} dill = [ - {version = ">=0.3.7", markers = "python_version >= \"3.12\""}, {version = ">=0.3.6", markers = "python_version >= \"3.11\" and python_version < \"3.12\""}, + {version = ">=0.3.7", markers = "python_version >= \"3.12\""}, ] isort = ">=4.2.5,<5.13.0 || >5.13.0,<6" mccabe = ">=0.6,<0.8" @@ -4481,8 +4452,8 @@ files = [ [package.dependencies] astroid = [ - {version = ">=3.0.0a1", markers = "python_version >= \"3.12\""}, {version = ">=2.7", markers = "python_version < \"3.12\""}, + {version = ">=3.0.0a1", markers = "python_version >= \"3.12\""}, ] Jinja2 = "*" PyYAML = "*" @@ -5013,17 +4984,6 @@ files = [ {file = "threadpoolctl-3.5.0.tar.gz", hash = "sha256:082433502dd922bf738de0d8bcc4fdcbf0979ff44c42bd40f5af8a282f6fa107"}, ] -[[package]] -name = "toml" -version = "0.10.2" -description = "Python Library for Tom's Obvious, Minimal Language" -optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" -files = [ - {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, - {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, -] - [[package]] name = "tomlkit" version = "0.13.2" @@ -5397,4 +5357,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = ">=3.11,<3.13" -content-hash = "b46501d6c00ea8314a13957bc588e30100c145be91167dfbb19ab68e4135ed69" +content-hash = "bdff22c7ba56c5431afa042b10e6bc37ad4fc367556d29a8bae6c18b4873cd72" diff --git a/pyproject.toml b/pyproject.toml index 802d874..a5a2500 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -96,7 +96,6 @@ python-keycloak = "^4.3.0" sqlalchemy-serializer = "^1.4.22" watchdog = "^5.0.3" ema-workbench = "^2.5.2" -names-generator = "^0.2.0" ipyparallel = "^8.8.0" schedule = "^1.2.2" diff --git a/src/ump/api/routes/ensembles.py b/src/ump/api/routes/ensembles.py index 7e2fba1..bfe92be 100644 --- a/src/ump/api/routes/ensembles.py +++ b/src/ump/api/routes/ensembles.py @@ -4,6 +4,7 @@ import copy import json import logging +from uuid import uuid1 from apiflask import APIBlueprint from ema_workbench import CategoricalParameter, RealParameter @@ -15,7 +16,6 @@ sample_parameters, ) from flask import Response, g, request -from names_generator import generate_name from sqlalchemy import create_engine, delete, or_, select from sqlalchemy.orm import Session @@ -435,7 +435,7 @@ def create_jobs(ensemble: Ensemble, auth): result_list = [] for config in results: process = Process(config["process_id"]) - job_name = ensemble.name + " - " + generate_name(style="plain") + job_name = ensemble.name + " - " + str(uuid1()) result_list.append( process.execute( {"job_name": f"{job_name}", "inputs": config["inputs"]},