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.

Sign up for GitHub

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

dy-static-file-server will consider initial input state as to be synced #159

Merged
merged 7 commits into from
Nov 15, 2024
Merged

dy-static-file-server will consider initial input state as to be synced #159

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ec4807b
refactor service
Nov 15, 2024
766c806
Merge remote-tracking branch 'origin/master'
Nov 15, 2024
5d09989
always try to sync
Nov 15, 2024
c4971d9
bumped version
Nov 15, 2024
b5b4deb
make toc
Nov 15, 2024
3808051
removed unused
Nov 15, 2024
a6bd6bf
revert
Nov 15, 2024
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
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion services/dy-static-file-server/.cookiecutterrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ default_context:
project_slug: 'dy-static-file-server'
project_type: 'computational'
release_date: '2021'
version: '2.0.6'
version: '2.0.7'
1 change: 1 addition & 0 deletions services/dy-static-file-server/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ info-build: ## displays info on the built image
tests-unit tests-integration: ## runs integration and unit tests
@.venv/bin/pytest -vv \
--basetemp=$(CURDIR)/tmp \
-vv -s --log-cli-level=DEBUG \
GitHK marked this conversation as resolved.
Show resolved Hide resolved
--exitfirst \
--failed-first \
--pdb \
Expand Down
2 changes: 1 addition & 1 deletion services/dy-static-file-server/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.6
2.0.7
6 changes: 3 additions & 3 deletions services/dy-static-file-server/docker-compose-meta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
io.simcore.name: '{"name": "dy-static-file-server"}'
io.simcore.outputs: '{"outputs": {}}'
io.simcore.type: '{"type": "dynamic"}'
io.simcore.version: '{"version": "2.0.6"}'
io.simcore.version: '{"version": "2.0.7"}'
org.label-schema.build-date: ${BUILD_DATE}
org.label-schema.schema-version: '1.0'
org.label-schema.vcs-ref: ${VCS_REF}
Expand All @@ -29,7 +29,7 @@ services:
io.simcore.name: '{"name": "dy-static-file-server-dynamic-sidecar"}'
io.simcore.outputs: '{"outputs": {"string_output": {"displayOrder": 1, "label": "String output", "description": "String value from input", "type": "string"}, "integer_output": {"displayOrder": 2, "label": "Integer output", "description": "Integer value from input", "type": "integer"}, "boolean_output": {"displayOrder": 3, "label": "Boolean output", "description": "Boolean value from input", "type": "boolean"}, "number_output": {"displayOrder": 4, "label": "Number output", "description": "Number value from input", "type": "number"}, "file_output": {"displayOrder": 5, "label": "File output", "description": "File from input", "type": "data:*/*", "fileToKeyMap": {"test_file": "file_output"}}}}'
io.simcore.type: '{"type": "dynamic"}'
io.simcore.version: '{"version": "2.0.6"}'
io.simcore.version: '{"version": "2.0.7"}'
org.label-schema.build-date: ${BUILD_DATE}
org.label-schema.schema-version: '1.0'
org.label-schema.vcs-ref: ${VCS_REF}
Expand All @@ -48,7 +48,7 @@ services:
io.simcore.name: '{"name": "dy-static-file-server-dynamic-sidecar-compose-spec"}'
io.simcore.outputs: '{"outputs": {"string_output": {"displayOrder": 1, "label": "String output", "description": "String value from input", "type": "string"}, "integer_output": {"displayOrder": 2, "label": "Integer output", "description": "Integer value from input", "type": "integer"}, "boolean_output": {"displayOrder": 3, "label": "Boolean output", "description": "Boolean value from input", "type": "boolean"}, "number_output": {"displayOrder": 4, "label": "Number output", "description": "Number value from input", "type": "number"}, "file_output": {"displayOrder": 5, "label": "File output", "description": "File from input", "type": "data:*/*", "fileToKeyMap": {"test_file": "file_output"}}}}'
io.simcore.type: '{"type": "dynamic"}'
io.simcore.version: '{"version": "2.0.6"}'
io.simcore.version: '{"version": "2.0.7"}'
org.label-schema.build-date: ${BUILD_DATE}
org.label-schema.schema-version: '1.0'
org.label-schema.vcs-ref: ${VCS_REF}
Expand Down
2 changes: 1 addition & 1 deletion services/dy-static-file-server/metadata/metadata-dynamic-sidecar-compose-spec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: dy-static-file-server-dynamic-sidecar-compose-spec
key: simcore/services/dynamic/dy-static-file-server-dynamic-sidecar-compose-spec
type: dynamic
integration-version: 1.0.0
version: 2.0.6
version: 2.0.7
description: Modern test dynamic service providing a docker-compose specification file (with dynamic sidecar and compose-spec). Changes to the inputs will be forwarded to the outputs. The /workdir/generated-data directory is populated if no content is present.
contact: [email protected]
authors:
Expand Down
2 changes: 1 addition & 1 deletion services/dy-static-file-server/metadata/metadata-dynamic-sidecar.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: dy-static-file-server-dynamic-sidecar
key: simcore/services/dynamic/dy-static-file-server-dynamic-sidecar
type: dynamic
integration-version: 1.0.0
version: 2.0.6
version: 2.0.7
description: Modern test dynamic service (with dynamic sidecar). Changes to the inputs will be forwarded to the outputs. The /workdir/generated-data directory is populated if no content is present.
contact: [email protected]
authors:
Expand Down
2 changes: 1 addition & 1 deletion services/dy-static-file-server/metadata/metadata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: dy-static-file-server
key: simcore/services/dynamic/dy-static-file-server
type: dynamic
integration-version: 1.0.0
version: 2.0.6
version: 2.0.7
description: Legacy test dynamic service (starts using original director-v0). The /workdir/generated-data directory is populated if no content is present.
contact: [email protected]
authors:
Expand Down
4 changes: 2 additions & 2 deletions services/dy-static-file-server/src/dy_static_file_server/inputs_to_outputs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ def _get_observed_state(self) -> Dict[Path, Dict[Path, Tuple[str, float]]]:

async def _monitor(self) -> None:

_logger.info("Started monitor")
previous_state = self._get_observed_state()
_logger.info("Started monitor on %s", self.to_observe)
previous_state = {} # always trigger once a sync

while self._keep_running:
await asyncio.sleep(self.monitor_interval)
Expand Down
2 changes: 1 addition & 1 deletion services/dy-static-file-server/versioning/service.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.0.6
current_version = 2.0.7
commit = False
message = service/kernel version: {current_version} → {new_version}
tag = False
Expand Down
6 changes: 3 additions & 3 deletions toc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"name": "dy-static-file-server",
"simcore.service.settings": "[{\"name\": \"resources\", \"type\": \"Resources\", \"value\": {\"mem_limit\":268435456, \"cpu_limit\": 10000000}}, {\"name\": \"ports\", \"type\": \"int\", \"value\": 8080}, {\"name\": \"constraints\", \"type\": \"string\", \"value\": [\"node.platform.os == linux\"]}]",
"type": "dynamic",
"version": "2.0.6"
"version": "2.0.7"
},
"dy-static-file-server-dynamic-sidecar": {
"description": "Modern test dynamic service (with dynamic sidecar). Changes to the inputs will be forwarded to the outputs. The /workdir/generated-data directory is populated if no content is present.",
Expand All @@ -86,7 +86,7 @@
"name": "dy-static-file-server-dynamic-sidecar",
"simcore.service.settings": "[{\"name\": \"resources\", \"type\": \"Resources\", \"value\": {\"mem_limit\":268435456, \"cpu_limit\": 10000000}}, {\"name\": \"ports\", \"type\": \"int\", \"value\": 8080}, {\"name\": \"constraints\", \"type\": \"string\", \"value\": [\"node.platform.os == linux\"]}]",
"type": "dynamic",
"version": "2.0.6"
"version": "2.0.7"
},
"dy-static-file-server-dynamic-sidecar-compose-spec": {
"description": "Modern test dynamic service providing a docker-compose specification file (with dynamic sidecar and compose-spec). Changes to the inputs will be forwarded to the outputs. The /workdir/generated-data directory is populated if no content is present.",
Expand All @@ -96,7 +96,7 @@
"name": "dy-static-file-server-dynamic-sidecar-compose-spec",
"simcore.service.settings": "[{\"name\": \"resources\", \"type\": \"Resources\", \"value\": {\"mem_limit\":268435456, \"cpu_limit\": 10000000}}, {\"name\": \"ports\", \"type\": \"int\", \"value\": 8080}, {\"name\": \"constraints\", \"type\": \"string\", \"value\": [\"node.platform.os == linux\"]}]",
"type": "dynamic",
"version": "2.0.6"
"version": "2.0.7"
},
"jupyter-base-notebook": {
"description": "Jupyter notebook",
Expand Down
Loading