Remove cast(EnvConfig, ...) due to DocBuildContext

Declare envconfig as EnvConfig type in DocBuildContext

Author: tomschr

src/docbuild/cli/cmd_build/__init__.py

@@ -58,7 +58,7 @@ def build(ctx: click.Context, doctypes: tuple[Doctype]) -> None:
     """
     ctx.ensure_object(DocBuildContext)
     context: DocBuildContext = ctx.obj
-    # env = cast(EnvConfig, context.envconfig)
+    # env = context.envconfig
 
     click.echo(f"[BUILD] Verbosity: {context.verbose}")
     click.echo(f"{context=}")

src/docbuild/cli/cmd_c14n/__init__.py

@@ -10,5 +10,5 @@ def c14n(ctx: click.Context) -> None:
 
     :param ctx: The Click context object.
     """
-    # env = cast(EnvConfig, context.envconfig)
+    # env = context.envconfig
     click.echo(f"[C17N] Verbosity: {ctx.obj.verbose}")

src/docbuild/cli/cmd_check/process.py

@@ -3,13 +3,11 @@
 from collections.abc import Sequence
 import logging
 from pathlib import Path
-from typing import cast
 
 from docbuild.cli.cmd_metadata.metaprocess import get_deliverable_from_doctype
 from docbuild.cli.context import DocBuildContext
 from docbuild.config.xml.stitch import create_stitchfile
 from docbuild.constants import DEFAULT_DELIVERABLES
-from docbuild.models.config.env import EnvConfig
 from docbuild.models.deliverable import Deliverable
 from docbuild.models.doctype import Doctype
 from docbuild.utils.git import ManagedGitRepo
@@ -56,7 +54,7 @@ async def process_check_files(
     """Verify DC file existence using official Deliverable models."""
     log.info("Starting DC file availability check...")
 
-    env_config = cast(EnvConfig, ctx.envconfig)
+    env_config = ctx.envconfig
     config_dir = env_config.paths.config_dir.expanduser()
     repo_root = env_config.paths.repo_dir.expanduser()
 

src/docbuild/cli/cmd_metadata/metaprocess.py

@@ -6,15 +6,14 @@
 import logging
 from pathlib import Path
 import shlex
-from typing import Any, cast
+from typing import Any
 
 from lxml import etree
 from pydantic import ValidationError
 from rich.console import Console
 
 from ...config.xml.stitch import create_stitchfile
 from ...constants import DEFAULT_DELIVERABLES
-from ...models.config.env import EnvConfig
 from ...models.deliverable import Deliverable
 from ...models.doctype import Doctype
 from ...models.manifest import Document, Manifest
@@ -408,7 +407,7 @@ async def process(
         configured correctly.
     :return: 0 if all files passed validation, 1 if any failures occurred.
     """
-    env = cast(EnvConfig, context.envconfig)
+    env = context.envconfig
     configdir = Path(env.paths.config_dir).expanduser()
     stdout.print(f"Config path: {configdir}")
     xmlconfigs = tuple(configdir.rglob("[a-z]*.xml"))

src/docbuild/cli/cmd_repo/cmd_dir.py

@@ -1,11 +1,9 @@
 """Show the directory path for permanent repositories."""
 
-from typing import cast
 
 import click
 
 from ...cli.context import DocBuildContext
-from ...models.config.env import EnvConfig
 
 
 @click.command(help=__doc__, name="dir")
@@ -19,7 +17,7 @@ def cmd_dir(ctx: click.Context) -> None:
     :param ctx: The Click context object.
     """
     context: DocBuildContext = ctx.obj
-    env = cast(EnvConfig, context.envconfig)
+    env = context.envconfig
     repo_dir = env.paths.repo_dir
     print(repo_dir)
     ctx.exit(0)

src/docbuild/cli/cmd_repo/cmd_list.py

@@ -1,13 +1,11 @@
 """List the available permanent repositories."""
 
 from pathlib import Path
-from typing import cast
 
 import click
 from rich.console import Console
 
 from ...cli.context import DocBuildContext
-from ...models.config.env import EnvConfig
 
 console = Console()
 console_err = Console(stderr=True)
@@ -26,7 +24,7 @@ def cmd_list(ctx: click.Context) -> None:
     :param ctx: The Click context object.
     """
     context: DocBuildContext = ctx.obj
-    env = cast(EnvConfig, context.envconfig)
+    env = context.envconfig
 
     repo_dir = env.paths.repo_dir
     repo_dir = Path(repo_dir).resolve()

src/docbuild/cli/cmd_repo/process.py

@@ -3,12 +3,10 @@
 import asyncio
 import logging
 from pathlib import Path
-from typing import cast
 
 from ...cli.context import DocBuildContext
 from ...config.xml.stitch import create_stitchfile
 from ...constants import GITLOGGER_NAME
-from ...models.config.env import EnvConfig
 from ...models.repo import Repo
 from ...utils.contextmgr import make_timer
 from ...utils.git import ManagedGitRepo
@@ -25,7 +23,7 @@ async def process(context: DocBuildContext, repos: tuple[str, ...]) -> int:
     :raises ValueError: If configuration paths are missing.
     """
     # The calling command function is expected to have checked context.envconfig.
-    envcfg = cast(EnvConfig, context.envconfig)
+    envcfg = context.envconfig
     config_dir_str = envcfg.paths.config_dir
     repo_dir_str = envcfg.paths.repo_dir
 

src/docbuild/cli/cmd_validate/__init__.py

@@ -4,11 +4,9 @@
 from collections.abc import Iterator
 import logging
 from pathlib import Path
-from typing import cast
 
 import click
 
-from ...models.config.env import EnvConfig
 from ..context import DocBuildContext
 from . import process as process_mod
 
@@ -38,7 +36,7 @@ def validate(
     :param validation_method: Validation method to use, 'jing' or 'lxml'.
     """
     context: DocBuildContext = ctx.obj
-    env = cast(EnvConfig, context.envconfig)
+    env = context.envconfig
 
     # Set the chosen validation method in the context for downstream use
     context.validation_method = validation_method.lower()

src/docbuild/cli/context.py

@@ -4,6 +4,7 @@
 from pathlib import Path
 from typing import Any
 
+from ..models.config.env import EnvConfig
 from ..models.doctype import Doctype
 
 
@@ -32,7 +33,7 @@ class DocBuildContext:
     envconfig_from_defaults: bool = False
     """Internal flag to indicate if the env's config was loaded from defaults"""
 
-    envconfig: dict[str, Any] | None = None
+    envconfig: EnvConfig | None = None
     """The accumulated content of all env config files"""
 
     doctypes: list[Doctype] | None = None