Skip to content

Commit 1d24989

Browse files
authored
refactor!: Remove deprecated enum values (#48)
1 parent bde35ae commit 1d24989

File tree

1 file changed

+2
-72
lines changed

1 file changed

+2
-72
lines changed

src/apify_shared/consts.py

Lines changed: 2 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -256,59 +256,6 @@ class ApifyEnvVars(str, Enum):
256256
WORKFLOW_KEY = 'APIFY_WORKFLOW_KEY'
257257
"""Unique identifier for grouping related Actor runs and API operations together."""
258258

259-
# Replaced by ActorEnvVars, kept for backward compatibility:
260-
ACTOR_BUILD_ID = 'APIFY_ACTOR_BUILD_ID'
261-
"""Deprecated: Use ActorEnvVars.BUILD_ID instead."""
262-
263-
ACTOR_BUILD_NUMBER = 'APIFY_ACTOR_BUILD_NUMBER'
264-
"""Deprecated: Use ActorEnvVars.BUILD_NUMBER instead."""
265-
266-
ACTOR_EVENTS_WS_URL = 'APIFY_ACTOR_EVENTS_WS_URL'
267-
"""Deprecated: Use ActorEnvVars.EVENTS_WEBSOCKET_URL instead."""
268-
269-
ACTOR_ID = 'APIFY_ACTOR_ID'
270-
"""Deprecated: Use ActorEnvVars.ID instead."""
271-
272-
ACTOR_RUN_ID = 'APIFY_ACTOR_RUN_ID'
273-
"""Deprecated: Use ActorEnvVars.RUN_ID instead."""
274-
275-
ACTOR_TASK_ID = 'APIFY_ACTOR_TASK_ID'
276-
"""Deprecated: Use ActorEnvVars.TASK_ID instead."""
277-
278-
CONTAINER_PORT = 'APIFY_CONTAINER_PORT'
279-
"""TCP port for the Actor's web server (deprecated name for WEB_SERVER_PORT)."""
280-
281-
CONTAINER_URL = 'APIFY_CONTAINER_URL'
282-
"""URL for accessing the Actor's web server (deprecated name for WEB_SERVER_URL)."""
283-
284-
DEFAULT_DATASET_ID = 'APIFY_DEFAULT_DATASET_ID'
285-
"""Deprecated: Use ActorEnvVars.DEFAULT_DATASET_ID instead."""
286-
287-
DEFAULT_KEY_VALUE_STORE_ID = 'APIFY_DEFAULT_KEY_VALUE_STORE_ID'
288-
"""Deprecated: Use ActorEnvVars.DEFAULT_KEY_VALUE_STORE_ID instead."""
289-
290-
DEFAULT_REQUEST_QUEUE_ID = 'APIFY_DEFAULT_REQUEST_QUEUE_ID'
291-
"""Deprecated: Use ActorEnvVars.DEFAULT_REQUEST_QUEUE_ID instead."""
292-
293-
INPUT_KEY = 'APIFY_INPUT_KEY'
294-
"""Deprecated: Use ActorEnvVars.INPUT_KEY instead."""
295-
296-
MEMORY_MBYTES = 'APIFY_MEMORY_MBYTES'
297-
"""Deprecated: Use ActorEnvVars.MEMORY_MBYTES instead."""
298-
299-
STARTED_AT = 'APIFY_STARTED_AT'
300-
"""Deprecated: Use ActorEnvVars.STARTED_AT instead."""
301-
302-
TIMEOUT_AT = 'APIFY_TIMEOUT_AT'
303-
"""Deprecated: Use ActorEnvVars.TIMEOUT_AT instead."""
304-
305-
# Deprecated, kept for backward compatibility:
306-
ACT_ID = 'APIFY_ACT_ID'
307-
"""Deprecated: Old name for Actor ID."""
308-
309-
ACT_RUN_ID = 'APIFY_ACT_RUN_ID'
310-
"""Deprecated: Old name for Actor run ID."""
311-
312259

313260
class ActorExitCodes(int, Enum):
314261
"""Standard exit codes used by Actors to indicate run completion status.
@@ -439,10 +386,8 @@ class RunGeneralAccess(str, Enum):
439386
ActorEnvVars.STANDBY_PORT,
440387
ActorEnvVars.WEB_SERVER_PORT,
441388
# Apify env vars
442-
ApifyEnvVars.CONTAINER_PORT,
443389
ApifyEnvVars.DEDICATED_CPUS,
444390
ApifyEnvVars.LOG_LEVEL,
445-
ApifyEnvVars.MEMORY_MBYTES,
446391
ApifyEnvVars.METAMORPH_AFTER_SLEEP_MILLIS,
447392
ApifyEnvVars.PERSIST_STATE_INTERVAL_MILLIS,
448393
ApifyEnvVars.PROXY_PORT,
@@ -452,7 +397,9 @@ class RunGeneralAccess(str, Enum):
452397
INTEGER_ENV_VARS: list[INTEGER_ENV_VARS_TYPE] = list(get_args(INTEGER_ENV_VARS_TYPE))
453398

454399
FLOAT_ENV_VARS_TYPE = Literal[
400+
# Actor env vars
455401
ActorEnvVars.MAX_TOTAL_CHARGE_USD,
402+
# Apify env vars
456403
ApifyEnvVars.MAX_USED_CPU_RATIO,
457404
]
458405

@@ -471,12 +418,8 @@ class RunGeneralAccess(str, Enum):
471418
BOOL_ENV_VARS: list[BOOL_ENV_VARS_TYPE] = list(get_args(BOOL_ENV_VARS_TYPE))
472419

473420
DATETIME_ENV_VARS_TYPE = Literal[
474-
# Actor env vars
475421
ActorEnvVars.STARTED_AT,
476422
ActorEnvVars.TIMEOUT_AT,
477-
# Apify env vars
478-
ApifyEnvVars.STARTED_AT,
479-
ApifyEnvVars.TIMEOUT_AT,
480423
]
481424

482425
DATETIME_ENV_VARS: list[DATETIME_ENV_VARS_TYPE] = list(get_args(DATETIME_ENV_VARS_TYPE))
@@ -497,23 +440,10 @@ class RunGeneralAccess(str, Enum):
497440
ActorEnvVars.TASK_ID,
498441
ActorEnvVars.WEB_SERVER_URL,
499442
# Apify env vars
500-
ApifyEnvVars.ACT_ID,
501-
ApifyEnvVars.ACT_RUN_ID,
502-
ApifyEnvVars.ACTOR_BUILD_ID,
503-
ApifyEnvVars.ACTOR_BUILD_NUMBER,
504-
ApifyEnvVars.ACTOR_EVENTS_WS_URL,
505-
ApifyEnvVars.ACTOR_ID,
506-
ApifyEnvVars.ACTOR_RUN_ID,
507-
ApifyEnvVars.ACTOR_TASK_ID,
508443
ApifyEnvVars.API_BASE_URL,
509444
ApifyEnvVars.API_PUBLIC_BASE_URL,
510-
ApifyEnvVars.CONTAINER_URL,
511445
ApifyEnvVars.DEFAULT_BROWSER_PATH,
512-
ApifyEnvVars.DEFAULT_DATASET_ID,
513-
ApifyEnvVars.DEFAULT_KEY_VALUE_STORE_ID,
514-
ApifyEnvVars.DEFAULT_REQUEST_QUEUE_ID,
515446
ApifyEnvVars.FACT,
516-
ApifyEnvVars.INPUT_KEY,
517447
ApifyEnvVars.INPUT_SECRETS_PRIVATE_KEY_FILE,
518448
ApifyEnvVars.INPUT_SECRETS_PRIVATE_KEY_PASSPHRASE,
519449
ApifyEnvVars.LOCAL_STORAGE_DIR,

0 commit comments

Comments
 (0)