-
Notifications
You must be signed in to change notification settings - Fork 3
JSON&Docker support #15
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
Merged
Changes from all commits
Commits
Show all changes
90 commits
Select commit
Hold shift + click to select a range
cba8b78
build: added .dockerignore
f1i3g3 cb84336
build: added Dockerfile
f1i3g3 f5e966f
build: added .dockerignore
f1i3g3 49a1419
build: added Dockerfile
f1i3g3 b28a4f2
build: added weibull experiment json configuration
f1i3g3 2fa4b1a
structure: merge branch 'deploy' of https://github.com/PySATL/pysatl-…
f1i3g3 f8c9059
fix: quick json fix
f1i3g3 7d3284f
fix: added report listeners in json
f1i3g3 f242d9b
feature: added first version of configuration parser
f1i3g3 1a9c888
fix: some quick linter fixes
f1i3g3 f8d2acd
fix: updated Dockerfile
f1i3g3 45dbc15
deploy: add one more TODO
f1i3g3 3160290
Add tests for resolvers
alex98247 3f0cb3f
Add tests for resolvers
alex98247 f9fcef2
feature: configuration parser refactored
f1i3g3 d69208c
structure: merge branch 'deploy' of https://github.com/PySATL/pysatl-…
f1i3g3 9b104ce
feature: added improved version of json config parser (with updated c…
f1i3g3 ee1de56
test: added unit tests for json config parser
f1i3g3 705d488
fix: renamed tests
f1i3g3 87bc9a0
fix: small changes
f1i3g3 3e78b25
fix: added default_threads
f1i3g3 9a22b56
fix: improved parer structure
f1i3g3 72522e2
fix: renamed config
f1i3g3 5d94c94
fix: small change in threads
f1i3g3 24643cf
fix: change entry point in Dockerfile
f1i3g3 51db537
build: added .dockerignore
f1i3g3 6186a62
build: added Dockerfile
f1i3g3 77218e0
build: added weibull experiment json configuration
f1i3g3 f202996
fix: quick json fix
f1i3g3 960496a
fix: added report listeners in json
f1i3g3 dfda79a
feature: added first version of configuration parser
f1i3g3 0b6765f
fix: some quick linter fixes
f1i3g3 4142530
fix: updated Dockerfile
f1i3g3 14a2e12
deploy: add one more TODO
f1i3g3 b22dc1c
Add tests for resolvers
alex98247 00b0574
feature: configuration parser refactored
f1i3g3 629a5da
feature: added improved version of json config parser (with updated c…
f1i3g3 6899ca3
test: added unit tests for json config parser
f1i3g3 23456d9
fix: renamed tests
f1i3g3 649d703
fix: small changes
f1i3g3 a5f756f
fix: added default_threads
f1i3g3 3591713
fix: improved parer structure
f1i3g3 ad0c84f
fix: renamed config
f1i3g3 31132c0
fix: small change in threads
f1i3g3 ba04189
fix: change entry point in Dockerfile
f1i3g3 4322f9b
structure: merge branch 'deploy' of https://github.com/PySATL/pysatl-…
f1i3g3 d70ee12
fix: small fixes
f1i3g3 46dc252
Fix ruff
alex98247 29f0f96
Fix ruff
alex98247 023e79c
Fix load config
alex98247 7840398
Fix load Docker
alex98247 75078a9
fix: small fix to updated Dockerfile
f1i3g3 80c3419
fix: small fixes
f1i3g3 8afc685
structure: moved experiments to appropriate folder
f1i3g3 0c98c0e
structure: minor changes
f1i3g3 b92199f
test: updated config example
f1i3g3 5621e91
fix: added missing file
f1i3g3 a7e3a44
structure: synchronize with main
f1i3g3 9201714
fix: quick ruff fix
f1i3g3 c216e2c
fix: quick renaming
f1i3g3 66b2765
fix: fixes & renaming
f1i3g3 d135ceb
fix: resolver fixes
f1i3g3 fb5bb1f
fix: removed TODOs
f1i3g3 d7e3a88
fix: removed TODOs
f1i3g3 7766e1e
fix: ConfigurationParser fix
f1i3g3 b11e514
fix: formatting
f1i3g3 62066d4
fix: some improvements
f1i3g3 289c7ef
fix: ruff formating
f1i3g3 9141e7b
fix: quick fix
f1i3g3 a24ec9b
fix: quick fix to resolvers
f1i3g3 e823f21
test: added configuration parser test
f1i3g3 7b17ec5
structure: resolving merge conflict
f1i3g3 ec45e5a
structure: added missing files
f1i3g3 a22b19d
fix: ruff formatting
f1i3g3 e9d1643
fix: quick fix
f1i3g3 6e3a5d4
fix: updated files to external criterion package
f1i3g3 f1e9e6c
fix: ruff formating
f1i3g3 a9d2bd3
fix: trying to make docker work
f1i3g3 a34dd11
feat: added Parsable interface
f1i3g3 0a07236
style: removed TODO
f1i3g3 b2ecc57
fix: small fix of statistic name in configuration example
f1i3g3 c72e8fc
fix: Parsable fix
f1i3g3 1b17681
format: ruff formatting
f1i3g3 9188961
fix: minor config fix
f1i3g3 ee0345a
test: revert to old version
f1i3g3 9282828
fix: made exceptions more informative
f1i3g3 38beb94
fix: path fix
f1i3g3 b84165c
fix: another path fix
f1i3g3 152ffce
fix: changes in config
f1i3g3 8b58bc8
fix: Dockerfile correction
f1i3g3 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| # Git | ||
| .git | ||
| .gitignore | ||
| .gitattributes | ||
|
|
||
| # CI | ||
| .codeclimate.yml | ||
| .travis.yml | ||
| .taskcluster.yml | ||
|
|
||
| # Docker | ||
| docker-compose.yml | ||
| Dockerfile | ||
| .docker | ||
| .dockerignore | ||
|
|
||
| # Byte-compiled / optimized / DLL files | ||
| **/__pycache__/ | ||
| **/*.py[cod] | ||
|
|
||
| # C extensions | ||
| *.so | ||
|
|
||
| # Distribution / packaging | ||
| .Python | ||
| env/ | ||
| build/ | ||
| develop-eggs/ | ||
| dist/ | ||
| downloads/ | ||
| eggs/ | ||
| lib/ | ||
| lib64/ | ||
| parts/ | ||
| sdist/ | ||
| var/ | ||
| *.egg-info/ | ||
| .installed.cfg | ||
| *.egg | ||
|
|
||
| # PyInstaller | ||
| # Usually these files are written by a python script from a template | ||
| # before PyInstaller builds the exe, so as to inject date/other infos into it. | ||
| *.manifest | ||
| *.spec | ||
|
|
||
| # Installer logs | ||
| pip-log.txt | ||
| pip-delete-this-directory.txt | ||
|
|
||
| # Unit test / coverage reports | ||
| htmlcov/ | ||
| .tox/ | ||
| .coverage | ||
| .cache | ||
| nosetests.xml | ||
| coverage.xml | ||
|
|
||
| # Translations | ||
| *.mo | ||
| *.pot | ||
|
|
||
| # Django stuff: | ||
| *.log | ||
|
|
||
| # Sphinx documentation | ||
| docs/_build/ | ||
|
|
||
| # PyBuilder | ||
| target/ | ||
|
|
||
| # Virtual environment | ||
| .env | ||
| .venv/ | ||
| venv/ | ||
|
|
||
| # PyCharm | ||
| .idea | ||
|
|
||
| # Python mode for VIM | ||
| .ropeproject | ||
| **/.ropeproject | ||
|
|
||
| # Vim swap files | ||
| **/*.swp | ||
|
|
||
| # VS Code | ||
| .vscode/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| FROM python:3.12.9-slim-bookworm AS base | ||
|
|
||
| WORKDIR /app | ||
|
|
||
| ENV LANG=C.UTF-8 | ||
| ENV LC_ALL=C.UTF-8 | ||
| ENV PYTHONDONTWRITEBYTECODE=1 | ||
| ENV PYTHONFAULTHANDLER=1 | ||
| ENV PATH=/home/pysatluser/.local/bin:$PATH | ||
| ENV POETRY_HOME=/opt/poetry | ||
|
|
||
| RUN apt-get update && apt-get install -y curl && \ | ||
| curl -sSL https://install.python-poetry.org | python - && \ | ||
| cd /usr/local/bin && \ | ||
| ln -s /opt/poetry/bin/poetry && \ | ||
| poetry config virtualenvs.create true | ||
|
|
||
| # Копируем файлы зависимостей | ||
| COPY pyproject.toml ./ | ||
|
|
||
| # Устанавливаем зависимости | ||
| RUN poetry install --no-interaction --no-ansi | ||
|
|
||
| # Копируем остальные файлы | ||
| COPY . . | ||
|
|
||
| ENTRYPOINT ["poetry", "run", "python", "-m", "stattest.main"] | ||
| # Default to experiment mode | ||
| CMD [ "experiment", "--config", "../../config_examples/config_example.json" ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| { | ||
| "generator_configuration": { | ||
| "generators": [ | ||
| { | ||
| "name": "ExponentialGenerator", | ||
| "params": { | ||
| "lam": 0.5 | ||
| } | ||
| } | ||
| ], | ||
| "sizes": [100, 200], | ||
| "count": 1000, | ||
| "threads": 1, | ||
| "skip_if_exists": true, | ||
| "clear_before": false, | ||
| "skip_step": false, | ||
| "show_progress": false, | ||
| "listeners": [ | ||
| { | ||
| "name": "TimeEstimationListener" | ||
| } | ||
| ] | ||
| }, | ||
| "test_configuration": { | ||
| "tests": [ | ||
| { | ||
| "name": "KolmogorovSmirnovWeibullGofStatistic" | ||
| } | ||
| ], | ||
| "threads": 8, | ||
| "worker": | ||
| { | ||
| "name": "PowerCalculationWorker", | ||
| "params": { | ||
| "alpha": 0.05, | ||
| "monte_carlo_count": 100000, | ||
| "cv_store": { | ||
| "name": "CriticalValueDbStore", | ||
| "params": { | ||
| "db_url": "sqlite:///weibull_experiment.sqlite" | ||
| } | ||
| }, | ||
| "hypothesis": { | ||
| "name": "WeibullHypothesis" | ||
| } | ||
| } | ||
| }, | ||
| "listeners": [ | ||
| { | ||
| "name": "TimeEstimationListener" | ||
| } | ||
| ] | ||
| }, | ||
| "report_configuration": { | ||
| "report_builder": { | ||
| "name": "PdfPowerReportBuilder" | ||
| }, | ||
| "listeners": [] | ||
| }, | ||
| "rvs_store": | ||
| { | ||
| "name": "RvsDbStore", | ||
| "params": | ||
| { | ||
| "db_url": "sqlite:///weibull_experiment.sqlite" | ||
| } | ||
| }, | ||
| "result_store": | ||
| { | ||
| "name": "ResultDbStore", | ||
| "params": | ||
| { | ||
| "db_url": "sqlite:///weibull_experiment.sqlite" | ||
| } | ||
| } | ||
| } | ||
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| { | ||
| "generator_configuration": { | ||
| "generators": [ | ||
| { | ||
| "name": "ExponentialGenerator", | ||
| "params": { | ||
| "lam": 0.5 | ||
| } | ||
| } | ||
| ], | ||
| "sizes": [100, 200], | ||
| "count": 1000, | ||
| "threads": 1, | ||
| "listeners": [ | ||
| { | ||
| "name": "TimeEstimationListener" | ||
| } | ||
| ] | ||
| }, | ||
| "test_configuration": { | ||
| "tests": [ | ||
| { | ||
| "name": "KSWeibullTest" | ||
| } | ||
| ], | ||
| "threads": 8, | ||
| "worker": | ||
| { | ||
| "name": "PowerCalculationWorker", | ||
| "params": { | ||
| "alpha": 0.05, | ||
| "monte_carlo_count": 100000, | ||
| "cv_store": { | ||
| "name": "CriticalValueDbStore", | ||
| "params": { | ||
| "db_url": "sqlite:///weibull_experiment.sqlite" | ||
| } | ||
| }, | ||
| "hypothesis": { | ||
| "name": "WeibullHypothesis" | ||
| } | ||
| } | ||
| }, | ||
| "listeners": [ | ||
| { | ||
| "name": "TimeEstimationListener" | ||
| } | ||
| ] | ||
| }, | ||
| "report_configuration": { | ||
| "report_builder": { | ||
| "name": "PdfPowerReportBuilder" | ||
| }, | ||
| "listeners": [] | ||
| }, | ||
| "rvs_store": | ||
| { | ||
| "name": "RvsDbStore", | ||
| "params": | ||
| { | ||
| "db_url": "sqlite:///weibull_experiment.sqlite" | ||
| } | ||
| }, | ||
| "result_store": | ||
| { | ||
| "name": "ResultDbStore", | ||
| "params": | ||
| { | ||
| "db_url": "sqlite:///weibull_experiment.sqlite" | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| --- | ||
| services: | ||
| stattest: | ||
| build: | ||
| context: . | ||
| # dockerfile: "./docker/Dockerfile.custom" | ||
| restart: unless-stopped | ||
| container_name: pysatl-experiment | ||
| volumes: | ||
| - "./user_data:/stattest/user_data" | ||
| # Default command used when running `docker compose up` | ||
| command: > | ||
| experiment | ||
| --logfile /stattest/user_data/logs/pysatl_experiment.log | ||
| --config /stattest/user_data/config.json |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.