Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase restart timeout, switch to osparc filecomms tools #8

Merged
merged 2 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.2.1
current_version = 0.2.2
commit = False
message = service version: {current_version} → {new_version}
tag = False
Expand Down
4 changes: 2 additions & 2 deletions .osparc/osparc-meta-dakota/metadata.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: DakotaService
description: "DakotaServiceService"
key: simcore/services/dynamic/osparc-meta-dakota
version: 0.2.1
integration-version: 0.2.1
version: 0.2.2
integration-version: 0.2.2
type: dynamic
authors:
- name: Werner Van Geit
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SHELL = /bin/sh
MAKEFLAGS += -j3

export DOCKER_IMAGE_NAME ?= osparc-meta-dakota
export DOCKER_IMAGE_TAG ?= 0.2.1
export DOCKER_IMAGE_TAG ?= 0.2.2

export MASTER_AWS_REGISTRY ?= registry.osparc-master-zmt.click
export MASTER_REGISTRY ?= registry.osparc-master.speag.com
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-local.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
osparc-meta-dakota:
image: simcore/services/dynamic/osparc-meta-dakota:0.2.1
image: simcore/services/dynamic/osparc-meta-dakota:0.2.2
ports:
- "8888:8888"
environment:
Expand Down
9 changes: 4 additions & 5 deletions docker_scripts/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

import pydantic as pyda
import pydantic_settings
from osparc_filecomms import tools

import dakota_start
import tools

logging.basicConfig(
level=logging.INFO, format="[%(filename)s:%(lineno)d] %(message)s"
Expand All @@ -16,7 +16,7 @@
CONF_SCHEMA_KEY = "conf_json_schema"

DEFAULT_FILE_POLLING_INTERVAL = 0.1
RESTART_ON_ERROR_MAX_TIME = 10.0
RESTART_ON_ERROR_MAX_TIME = 3600.0
RESTART_ON_ERROR_POLLING_INTERVAL = 1.0


Expand All @@ -36,6 +36,7 @@ def main():
dakservice = dakota_start.DakotaService(settings)
dakservice.start()


class DakotaDynamicSettings:
def __init__(self):
self._settings = self.DakotaMainSettings()
Expand Down Expand Up @@ -80,9 +81,7 @@ class DakotaMainSettings(pydantic_settings.BaseSettings):
output_path: pyda.DirectoryPath = pyda.Field(
alias="DY_SIDECAR_PATH_OUTPUTS"
)
restart_on_error: bool = pyda.Field(
default=False
)
restart_on_error: bool = pyda.Field(default=False)
restart_on_error_max_time: float = pyda.Field(
default=RESTART_ON_ERROR_MAX_TIME, ge=0
)
Expand Down
70 changes: 0 additions & 70 deletions docker_scripts/tools.py

This file was deleted.