From 66c5dd74ef9db0f350c3674628edb7a549094b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Nesveda?= Date: Thu, 5 Dec 2024 14:03:48 +0100 Subject: [PATCH] feat: add new environment variables --- CHANGELOG.md | 8 ++++++++ CONTRIBUTING.md | 2 +- pyproject.toml | 2 +- src/apify_shared/consts.py | 16 +++++++++++++++- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfab58c..3ddf504 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,15 @@ # Changelog +## [1.2.0](../../releases/tag/v1.2.0) - 2024-12-05 + +### Added + +- Added new environment variables + ## [1.1.2](../../releases/tag/v1.1.2) - 2024-07-04 +### Added + - Added constants for Actor Standby ## [1.1.1](../../releases/tag/v1.1.1) - 2024-01-08 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cc11c77..6e596e3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -86,7 +86,7 @@ Currently, there is no explicit approval process, so when you are done with the Once released, manually bump the version in `pyproject.toml` ([commit example](https://github.com/apify/apify-shared-python/commit/24a269bcf046df7202a8652ee788ffe9a461e58b)). -## Maintanance +## Maintenance ### Removing Support for an outdated Python version diff --git a/pyproject.toml b/pyproject.toml index 9207cc2..b2adbe2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "apify_shared" -version = "1.1.2" +version = "1.2.0" description = "Tools and constants shared across Apify projects." readme = "README.md" license = { text = "Apache Software License" } diff --git a/src/apify_shared/consts.py b/src/apify_shared/consts.py index 2ed0a69..3773339 100644 --- a/src/apify_shared/consts.py +++ b/src/apify_shared/consts.py @@ -70,6 +70,8 @@ class ActorEnvVars(str, Enum): BUILD_ID = 'ACTOR_BUILD_ID' #: BUILD_NUMBER BUILD_NUMBER = 'ACTOR_BUILD_NUMBER' + #: BUILD_TAGS + BUILD_TAGS = 'ACTOR_BUILD_TAGS' #: DEFAULT_DATASET_ID DEFAULT_DATASET_ID = 'ACTOR_DEFAULT_DATASET_ID' #: DEFAULT_KEY_VALUE_STORE_ID @@ -78,18 +80,24 @@ class ActorEnvVars(str, Enum): DEFAULT_REQUEST_QUEUE_ID = 'ACTOR_DEFAULT_REQUEST_QUEUE_ID' #: EVENTS_WEBSOCKET_URL EVENTS_WEBSOCKET_URL = 'ACTOR_EVENTS_WEBSOCKET_URL' + #: FULL_NAME + FULL_NAME = 'ACTOR_FULL_NAME' #: ID ID = 'ACTOR_ID' #: INPUT_KEY INPUT_KEY = 'ACTOR_INPUT_KEY' #: MAX_PAID_DATASET_ITEMS MAX_PAID_DATASET_ITEMS = 'ACTOR_MAX_PAID_DATASET_ITEMS' + #: MAX_TOTAL_CHARGE_USD + MAX_TOTAL_CHARGE_USD = 'ACTOR_MAX_TOTAL_CHARGE_USD' #: MEMORY_MBYTES MEMORY_MBYTES = 'ACTOR_MEMORY_MBYTES' #: RUN_ID RUN_ID = 'ACTOR_RUN_ID' #: STANDBY_PORT STANDBY_PORT = 'ACTOR_STANDBY_PORT' + #: STANDBY_URL + STANDBY_URL = 'ACTOR_STANDBY_URL' #: STARTED_AT STARTED_AT = 'ACTOR_STARTED_AT' #: TASK_ID @@ -285,7 +293,10 @@ class MetaOrigin(str, Enum): INTEGER_ENV_VARS: list[INTEGER_ENV_VARS_TYPE] = list(get_args(INTEGER_ENV_VARS_TYPE)) -FLOAT_ENV_VARS_TYPE = Literal[ApifyEnvVars.MAX_USED_CPU_RATIO,] +FLOAT_ENV_VARS_TYPE = Literal[ + ActorEnvVars.MAX_TOTAL_CHARGE_USD, + ApifyEnvVars.MAX_USED_CPU_RATIO, +] FLOAT_ENV_VARS: list[FLOAT_ENV_VARS_TYPE] = list(get_args(FLOAT_ENV_VARS_TYPE)) @@ -316,13 +327,16 @@ class MetaOrigin(str, Enum): # Actor env vars ActorEnvVars.BUILD_ID, ActorEnvVars.BUILD_NUMBER, + ActorEnvVars.BUILD_TAGS, ActorEnvVars.DEFAULT_DATASET_ID, ActorEnvVars.DEFAULT_KEY_VALUE_STORE_ID, ActorEnvVars.DEFAULT_REQUEST_QUEUE_ID, ActorEnvVars.EVENTS_WEBSOCKET_URL, + ActorEnvVars.FULL_NAME, ActorEnvVars.ID, ActorEnvVars.INPUT_KEY, ActorEnvVars.RUN_ID, + ActorEnvVars.STANDBY_URL, ActorEnvVars.TASK_ID, ActorEnvVars.WEB_SERVER_URL, # Apify env vars