Skip to content

Commit

Permalink
Fix manifests (#141)
Browse files Browse the repository at this point in the history
* Updated manifest files

* add user e-mail to logging
  • Loading branch information
rubenpeters91 authored Nov 5, 2024
1 parent 6adea35 commit d0911d8
Show file tree
Hide file tree
Showing 10 changed files with 190 additions and 73 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.4.7] - 2024-11-04

### Changed
- Updated manifest files

### Added
- Username now also saved when filling in call response

### Fixed
- Alembic now applies ruff format before linter, to prevent errors when generating migrate scripts

## [1.4.6] - 2024-10-29

### Fixed
Expand Down
12 changes: 6 additions & 6 deletions alembic.ini
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,18 @@ sqlalchemy.url =


[post_write_hooks]
hooks = ruff, ruff_format

# lint with attempts to fix using "ruff"
ruff.type = exec
ruff.executable = %(here)s/.venv/bin/ruff
ruff.options = check --fix REVISION_SCRIPT_FILENAME
hooks = ruff_format, ruff

# format using "ruff" - use the exec runner, execute a binary
ruff_format.type = exec
ruff_format.executable = %(here)s/.venv/bin/ruff
ruff_format.options = format REVISION_SCRIPT_FILENAME

# lint with attempts to fix using "ruff"
ruff.type = exec
ruff.executable = %(here)s/.venv/bin/ruff
ruff.options = check --fix REVISION_SCRIPT_FILENAME

# Logging configuration
[loggers]
keys = root,sqlalchemy,alembic
Expand Down
34 changes: 34 additions & 0 deletions alembic/versions/84310a5c9e71_add_user.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""add user
Revision ID: 84310a5c9e71
Revises: 20f444146781
Create Date: 2024-11-04 15:53:30.446979
"""

from typing import Sequence, Union

import sqlalchemy as sa
from alembic import op

# revision identifiers, used by Alembic.
revision: str = "84310a5c9e71"
down_revision: Union[str, None] = "20f444146781"
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None


def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.add_column(
"apicallresponse",
sa.Column("user", sa.String(length=100), nullable=True),
schema="noshow",
)
# ### end Alembic commands ###


def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column("apicallresponse", "user", schema="noshow")
# ### end Alembic commands ###
68 changes: 43 additions & 25 deletions manifest_admin_dash.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"locale": "en_US.UTF-8",
"metadata": {
"appmode": "python-streamlit",
"entrypoint": "run/admin_dash"
"entrypoint": "run/admin_dash.py"
},
"python": {
"version": "3.11.7",
"version": "3.11.10",
"package_manager": {
"name": "pip",
"version": "23.3.1",
Expand All @@ -15,7 +15,7 @@
},
"files": {
"requirements.txt": {
"checksum": "def181daf081b4f7c83c9566683f8472"
"checksum": "f70c5842ab5ed362f02f9e51e8056a6f"
},
".dvcignore": {
"checksum": "34659c119a2634fe318cd6a4822df435"
Expand All @@ -24,58 +24,67 @@
"checksum": "a851d2b36a975d3155f448d08a4b7527"
},
".gitignore": {
"checksum": "2da14bc0356b25f34ace0ca1fd375c3e"
"checksum": "ca95646077c76f4dc6e795b7ef13d27c"
},
".python-version": {
"checksum": "c0479ff484dacd51dc5ba0461b16b9bf"
},
".streamlit/config.toml": {
"checksum": "99594759045ead1f8535775e35169a3d"
},
"CHANGELOG.md": {
"checksum": "62745956109803ac9f2d19c60e26cf25"
"checksum": "0f741890be14219f021df1965cf70426"
},
"LICENSE": {
"checksum": "770bb10345b6c86b9f5dc743de74aadf"
},
"README.md": {
"checksum": "22b1aafab9743843daf608c23df19b50"
},
"alembic.ini": {
"checksum": "36c3eb4c11f85255bd615d1d61819684"
},
"data/dataset_card.md": {
"checksum": "b1affb9bf9e84a4721a61ab70d017c45"
"checksum": "8e9c1ad06da9191965a70fc3c1c14747"
},
"data/processed/fixed_pred_score_bin.json": {
"checksum": "8f30e8935c07d5dc5f0dcefe739d626b"
"checksum": "edc09f5a24202e398888f108280cda2d"
},
"deploy.sh": {
"checksum": "21971b0584e7574dea4fa31a9b562930"
"checksum": "0de252d918314092524baf73e003c014"
},
"dvc.lock": {
"checksum": "bdcf84783a5a73cc266a64f484dd2d7d"
"checksum": "c7cc4aa03c818f205dcd4cd8044b887a"
},
"dvc.yaml": {
"checksum": "e14888b51b20aa7ed8d1a7a8d63e33a9"
},
"manifest_admin_dash.json": {
"checksum": "af54d64f1de8d4c106f8b73065b8eecf"
},
"manifest_api.json": {
"checksum": "a8288ff6f975f2d0bc47286c6d60bb46"
"checksum": "01784994729371234cf680db374ec384"
},
"manifest_dash.json": {
"checksum": "453b10c9642bc53ee6f367783bffd95c"
"checksum": "833b64601035f3f2b8721762d38fa264"
},
"pyproject.toml": {
"checksum": "f7f0b183e0a13e18ebbfb3a62961ace0"
"checksum": "5dd2d2470bd8383f9cff197ccee8f8d6"
},
"run/admin_dash.py": {
"checksum": "a06acd77b7d96e960dcd77a80443e843"
"checksum": "23d27b06dab4a9c50e802b573bf3dd39"
},
"run/app.py": {
"checksum": "07ea1ee70ce2cfdd157a5d234a54cbfb"
},
"run/calling_dash.py": {
"checksum": "e1a1ca9abe320642e10164b2186355ff"
"checksum": "8f812b7cca6d9649df19332017f0f930"
},
"run/config/config.toml": {
"checksum": "629aba9e47ee1d11623c1fed8b4fc05d"
"checksum": "fc166438569074175c386c4a31d0184c"
},
"run/config/config.toml.dvc": {
"checksum": "5efc65b8dd0fadcfacb5d22c473964e7"
"checksum": "9859113746e147a7efab10481e7a1769"
},
"setup.cfg": {
"checksum": "bbbe201f135ed769da1877db5cc56fb6"
Expand All @@ -84,28 +93,34 @@
"checksum": "d41d8cd98f00b204e9800998ecf8427e"
},
"src/noshow/api/app.py": {
"checksum": "d154feab70dd6fbe0c802a235c161263"
"checksum": "7c1a69733b40bf9ca543c3dd397ec088"
},
"src/noshow/api/app_helpers.py": {
"checksum": "80c60a11d3eddb43f78d9404d919e8c6"
"checksum": "8cdf328dafcecc5ae20754d5b063a067"
},
"src/noshow/api/pydantic_models.py": {
"checksum": "d8964b991b1d1b1de9a7962519c193e3"
},
"src/noshow/config.py": {
"checksum": "84b7d09f2bdba372b271dae5edbd8159"
"checksum": "2773e64669bd1b2d9e3a1663974634e4"
},
"src/noshow/dashboard/__init__.py": {
"checksum": "d41d8cd98f00b204e9800998ecf8427e"
},
"src/noshow/dashboard/connection.py": {
"checksum": "c9937df6314b1c19609104c831037aa7"
"checksum": "c7491be3828089c576062b3a933a8bdf"
},
"src/noshow/dashboard/helper.py": {
"checksum": "c32be5c926e379fa6854a3a61e2dff16"
"checksum": "e1d6be5d1c69dd3ba2979fc9b0a166ff"
},
"src/noshow/database/__init__.py": {
"checksum": "d41d8cd98f00b204e9800998ecf8427e"
},
"src/noshow/database/connection.py": {
"checksum": "9c1fab4632ca7e9b353a906d4719d243"
},
"src/noshow/database/models.py": {
"checksum": "a9d85a0414e22eb6a780b4287c3fbd33"
"checksum": "14812e855bd5dced17e236848feef11e"
},
"src/noshow/features/appointment_features.py": {
"checksum": "3c58c90ca0b5df7bbce4a328ca235e58"
Expand All @@ -114,7 +129,7 @@
"checksum": "eb2109a96e2c7a10c028a85af658171b"
},
"src/noshow/features/feature_pipeline.py": {
"checksum": "c58cd256e4737f0e7455e3de4e395315"
"checksum": "71ffb7a162976bde11e0aed72ea19f98"
},
"src/noshow/features/no_show_features.py": {
"checksum": "4df69daf90146a762360ebb22668b098"
Expand All @@ -126,7 +141,7 @@
"checksum": "d41d8cd98f00b204e9800998ecf8427e"
},
"src/noshow/model/predict.py": {
"checksum": "d6afc83f0160fc766e7497a9d467b770"
"checksum": "37a9c108b731c632608f5058c9e0f308"
},
"src/noshow/model/train_model.py": {
"checksum": "00964a947199825f721ebbbe0bb23da6"
Expand All @@ -138,7 +153,7 @@
"checksum": "ad3285f5a7f55f0ca27a6c496212a05e"
},
"src/noshow/preprocessing/load_data.py": {
"checksum": "43b3a0bad5ff08dc5d48e3dc0ea5a044"
"checksum": "f63a1f950ab95b38fcf982b733f39f62"
},
"src/noshow/preprocessing/utils.py": {
"checksum": "5c84176aa1d08e3c246120ff5e0b1abf"
Expand All @@ -148,6 +163,9 @@
},
"src/noshow/visualisation/features_plots.py": {
"checksum": "4bc6f06a7afb732c57147c4f011256d3"
},
"uv.lock": {
"checksum": "603a1be208265e9a0ed7a57aa64e8535"
}
}
}
40 changes: 23 additions & 17 deletions manifest_api.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"entrypoint": "run.app:app"
},
"python": {
"version": "3.11.7",
"version": "3.11.10",
"package_manager": {
"name": "pip",
"version": "23.3.1",
Expand All @@ -15,7 +15,7 @@
},
"files": {
"requirements.txt": {
"checksum": "3858b62abeb3e8f26af98e4f16abed3e"
"checksum": "f70c5842ab5ed362f02f9e51e8056a6f"
},
".dvcignore": {
"checksum": "34659c119a2634fe318cd6a4822df435"
Expand All @@ -33,7 +33,7 @@
"checksum": "99594759045ead1f8535775e35169a3d"
},
"CHANGELOG.md": {
"checksum": "f4513fa41981e6753b0d91502fa11c63"
"checksum": "0f741890be14219f021df1965cf70426"
},
"LICENSE": {
"checksum": "770bb10345b6c86b9f5dc743de74aadf"
Expand All @@ -57,37 +57,37 @@
"checksum": "0de252d918314092524baf73e003c014"
},
"dvc.lock": {
"checksum": "8e4ee569dcd7d826017e7d8f7f6413e4"
"checksum": "c7cc4aa03c818f205dcd4cd8044b887a"
},
"dvc.yaml": {
"checksum": "e14888b51b20aa7ed8d1a7a8d63e33a9"
},
"manifest_api.json": {
"checksum": "721f97985b53cfbc82c9fd8660248b9f"
"checksum": "ddf3dbd0fd8b52b16d7a241a173b6f09"
},
"manifest_dash.json": {
"checksum": "2cc39523168242ac2c30f9ff5d6af2c0"
"checksum": "833b64601035f3f2b8721762d38fa264"
},
"output/models/no_show_model_cv.pickle": {
"checksum": "d754ad05309b61b28c6a9fff0d8ad177"
"checksum": "3d81bdcc860f51a1843593988ac2c1f6"
},
"pyproject.toml": {
"checksum": "5f637f1e689b6a23deb46e3bfbddc749"
"checksum": "5dd2d2470bd8383f9cff197ccee8f8d6"
},
"run/admin_dash.py": {
"checksum": "79f9f665466959b23b421b1f6eb05543"
"checksum": "23d27b06dab4a9c50e802b573bf3dd39"
},
"run/app.py": {
"checksum": "07ea1ee70ce2cfdd157a5d234a54cbfb"
},
"run/calling_dash.py": {
"checksum": "338a395c8b8a8cc741b15f03ffada712"
"checksum": "8f812b7cca6d9649df19332017f0f930"
},
"run/config/config.toml": {
"checksum": "55d914731e8349a5c87f7e4329f98a1c"
"checksum": "fc166438569074175c386c4a31d0184c"
},
"run/config/config.toml.dvc": {
"checksum": "a47a99744442acf4f8e73e871a931879"
"checksum": "9859113746e147a7efab10481e7a1769"
},
"setup.cfg": {
"checksum": "bbbe201f135ed769da1877db5cc56fb6"
Expand All @@ -96,13 +96,13 @@
"checksum": "d41d8cd98f00b204e9800998ecf8427e"
},
"src/noshow/api/app.py": {
"checksum": "57b4712c8e3e84ec4a05665bb2c4192d"
"checksum": "7c1a69733b40bf9ca543c3dd397ec088"
},
"src/noshow/api/app_helpers.py": {
"checksum": "8cdf328dafcecc5ae20754d5b063a067"
},
"src/noshow/api/pydantic_models.py": {
"checksum": "4f51dd0166e29892299ea7ed1c03a01b"
"checksum": "d8964b991b1d1b1de9a7962519c193e3"
},
"src/noshow/config.py": {
"checksum": "2773e64669bd1b2d9e3a1663974634e4"
Expand All @@ -111,16 +111,19 @@
"checksum": "d41d8cd98f00b204e9800998ecf8427e"
},
"src/noshow/dashboard/connection.py": {
"checksum": "9257391d6d8d616e57f9368af477a704"
"checksum": "c7491be3828089c576062b3a933a8bdf"
},
"src/noshow/dashboard/helper.py": {
"checksum": "dd4f2e75aa3181c55eef945cb84f3136"
"checksum": "e1d6be5d1c69dd3ba2979fc9b0a166ff"
},
"src/noshow/database/__init__.py": {
"checksum": "d41d8cd98f00b204e9800998ecf8427e"
},
"src/noshow/database/connection.py": {
"checksum": "9c1fab4632ca7e9b353a906d4719d243"
},
"src/noshow/database/models.py": {
"checksum": "0641a09cc84e075a35dfb808c828efdc"
"checksum": "14812e855bd5dced17e236848feef11e"
},
"src/noshow/features/appointment_features.py": {
"checksum": "3c58c90ca0b5df7bbce4a328ca235e58"
Expand Down Expand Up @@ -163,6 +166,9 @@
},
"src/noshow/visualisation/features_plots.py": {
"checksum": "4bc6f06a7afb732c57147c4f011256d3"
},
"uv.lock": {
"checksum": "603a1be208265e9a0ed7a57aa64e8535"
}
}
}
Loading

0 comments on commit d0911d8

Please sign in to comment.