corio 2.2.0__tar.gz → 2.2.1__tar.gz

{corio-2.2.0 → corio-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: corio
-Version: 2.2.0
+Version: 2.2.1
 Summary: Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML
 Author-email: Frontmatter AI <innovative.fowler@mask.pro.fmtr.dev>
 License-Expression: Apache-2.0
@@ -273,6 +273,14 @@ Requires-Dist: pydantic; extra == "secrets"
 Requires-Dist: pydantic-extra-types; extra == "secrets"
 Requires-Dist: pycountry; extra == "secrets"
 Requires-Dist: pygit2; extra == "secrets"
+Provides-Extra: cli
+Requires-Dist: pydantic-settings; extra == "cli"
+Requires-Dist: pydantic; extra == "cli"
+Requires-Dist: pydantic-extra-types; extra == "cli"
+Requires-Dist: pycountry; extra == "cli"
+Requires-Dist: yamlscript; extra == "cli"
+Requires-Dist: pyyaml; extra == "cli"
+Requires-Dist: logfire; extra == "cli"
 Provides-Extra: all
 Requires-Dist: logfire; extra == "all"
 Requires-Dist: semver; extra == "all"

{corio-2.2.0 → corio-2.2.1}/corio/__init__.py

@@ -4,7 +4,7 @@ IMPORT_HOOK = ImportHook()
 
 from corio.constants import Constants
 from corio.path.path import Path, PackagePaths
-from corio.logging import logger
+from corio.logs import logger
 
 
 try:
@@ -13,9 +13,9 @@ except ImportError as exception:
     AppPaths = MissingExtraMockModule('path.app', exception)
 
 try:
-    from corio.http import Client
-except ImportError as exception:
-    Client = MissingExtraMockModule('http', exception)
+    from corio.https import Client
+except (ImportError, RuntimeError) as exception:
+    Client = MissingExtraMockModule('https', exception)
 
 try:
     from corio.profiling import Timer

{corio-2.2.0 → corio-2.2.1}/corio/ai/agentic.py

@@ -12,8 +12,8 @@ from typing import List, Optional, Any, Annotated, Generic
 
 from corio import env as env
 from corio.constants import Constants
-from corio.logging import logger
-from corio.string import truncate_mid
+from corio.logs import logger
+from corio.strings import truncate_mid
 
 logfire.instrument_pydantic_ai()
 

{corio-2.2.0 → corio-2.2.1}/corio/api.py

@@ -8,7 +8,7 @@ from fastapi import FastAPI, Request
 
 from corio import env
 from corio.iterator import enlist
-from corio.logging import logger
+from corio.logs import logger
 
 for name in ["uvicorn.access", "uvicorn.error", "uvicorn"]:
     logger_uvicorn = logging.getLogger(name)

{corio-2.2.0 → corio-2.2.1}/corio/caching.py

@@ -3,7 +3,7 @@ from datetime import timedelta, datetime
 from diskcache import Cache
 
 from corio.constants import Constants
-from corio.logging import logger
+from corio.logs import logger
 from corio.path.path import Path
 
 

{corio-2.2.0 → corio-2.2.1}/corio/db/document.py

@@ -6,7 +6,7 @@ from typing import List
 
 from corio import dm
 from corio.constants import Constants
-from corio.logging import logger
+from corio.logs import logger
 
 ModifyEvents = [
     actions.Insert,

{corio-2.2.0 → corio-2.2.1}/corio/dm.py

@@ -9,7 +9,7 @@ from typing import ClassVar, List, Any, Dict
 
 from corio.datatype import is_optional, none_else
 from corio.iterator import get_class_lookup
-from corio.string import camel_to_snake
+from corio.strings import camel_to_snake
 from corio.tools import Auto, Required, Empty
 
 

{corio-2.2.0 → corio-2.2.1}/corio/dns/client.py

@@ -5,9 +5,9 @@ from typing import Optional, Dict
 from dns import query as dnspython_query, message as dnspython_message, rdatatype as dnspython_rdatatype, rcode as dnspython_rcode
 from httpx_retries import Retry, RetryTransport
 
-from corio import http as http
+from corio import https as https
 from corio.dns.dm import Exchange, Response
-from corio.logging import logger
+from corio.logs import logger
 
 RETRY_STRATEGY = Retry(
     total=2,  # initial + 1 retry
@@ -21,7 +21,7 @@ RETRY_STRATEGY = Retry(
 )
 
 
-class HTTPClientDoH(http.Client):
+class HTTPClientDoH(https.Client):
     """
 
     Base HTTP client for DoH-appropriate retry strategy.

{corio-2.2.0 → corio-2.2.1}/corio/dns/dm.py

@@ -8,7 +8,7 @@ from dns import rcode as dnspython_rcode, reversename as dnspython_reversename
 from dns.message import Message, QueryMessage
 from dns.rrset import RRset
 
-from corio.string import join
+from corio.strings import join
 
 TTL_CODE_DEFAULTS = {
     dnspython_rcode.NOERROR: 300,  # Successful query

{corio-2.2.0 → corio-2.2.1}/corio/dns/proxy.py

@@ -2,7 +2,7 @@ from dataclasses import dataclass
 
 from corio.dns import server, client
 from corio.dns.dm import Exchange
-from corio.logging import logger
+from corio.logs import logger
 
 
 @dataclass(kw_only=True, eq=False)

{corio-2.2.0 → corio-2.2.1}/corio/dns/server.py

@@ -7,7 +7,7 @@ from typing import Optional
 
 from corio import caching as caching
 from corio.dns.dm import Exchange
-from corio.logging import logger
+from corio.logs import logger
 
 
 @dataclass(kw_only=True, eq=False)

{corio-2.2.0 → corio-2.2.1}/corio/encrypt.py

@@ -8,7 +8,7 @@ from pyrage import x25519
 
 import corio.env as env
 from corio.constants import Constants
-from corio.json import to_json, from_json
+from corio.jsn import to_json, from_json
 from corio.path import Path
 
 SerializableScalar = Union[str, int, float, bool, None]

corio-2.2.1/corio/entrypoint.py

@@ -0,0 +1,98 @@
+from pydantic_settings import CliSubCommand
+
+from corio import dm
+from corio import secrets
+from corio import sets
+
+
+class DocServe(dm.Base):
+    def run(self):
+        from corio.infra.project import Project
+        from corio.infra.releaser import ReleaseDocumentation
+        from corio.path import PackagePaths, Path
+
+        paths = PackagePaths(Path.cwd())
+        project = Project(paths.name_ns)
+        release = ReleaseDocumentation(project.releaser)
+
+        with paths.repo.chdir:
+            return release.serve(
+                host="0.0.0.0",
+                port=8180 + paths.metadata.port,
+            )
+
+
+class Docs(dm.Base):
+    serve: CliSubCommand[DocServe]
+
+
+class Pyproject(dm.Base):
+    def run(self):
+        from corio.infra.incrementor_pyproject import IncrementorPyproject
+        from corio.infra.project import Project
+        from corio.paths import paths
+
+        project = Project(paths.name_ns)
+        project.versions.pinned = project.versions.old
+        return IncrementorPyproject(project.releaser).apply()
+
+
+class EpTest(dm.Base):
+    def run(self):
+        print("Ran test entrypoint.")
+
+
+class ShellDebug(dm.Base):
+    def run(self):
+        from corio import debug
+
+        return debug.debug_shell()
+
+
+class CacheHfh(dm.Base):
+    def run(self):
+        import corio
+
+        return corio.hfh.main()
+
+
+class Infra(dm.Base):
+    def run(self):
+        from corio.infra.api import Api
+
+        return Api.launch()
+
+
+class InstallYamlscript(dm.Base):
+    def run(self):
+        from corio import yml
+
+        return yml.install()
+
+
+class RemoteDebugTest(dm.Base):
+    def run(self):
+        from corio import debug
+
+        return debug.trace(is_debug=True)
+
+
+class Cli(sets.Base, cli_parse_args=True):
+    secrets: CliSubCommand[secrets.Cli]
+    docs: CliSubCommand[Docs]
+    pyproject: CliSubCommand[Pyproject]
+    ep_test: CliSubCommand[EpTest]
+    shell_debug: CliSubCommand[ShellDebug]
+    cache_hfh: CliSubCommand[CacheHfh]
+    infra: CliSubCommand[Infra]
+    install_yamlscript: CliSubCommand[InstallYamlscript]
+    remote_debug_test: CliSubCommand[RemoteDebugTest]
+
+
+def main():
+    config = Cli()
+    config.run()
+
+
+if __name__ == "__main__":
+    main()

{corio-2.2.0 → corio-2.2.1}/corio/google_api.py

@@ -6,7 +6,7 @@ from google.oauth2.credentials import Credentials
 from google_auth_oauthlib.flow import InstalledAppFlow
 from googleapiclient.discovery import build, Resource
 
-from corio.logging import logger
+from corio.logs import logger
 from corio.path import Path
 
 

{corio-2.2.0 → corio-2.2.1}/corio/ha/utils.py

@@ -2,8 +2,8 @@ import os
 from dotenv import load_dotenv
 
 from corio.ha import constants
-from corio.logging import logger
-from corio.string import ELLIPSIS
+from corio.logs import logger
+from corio.strings import ELLIPSIS
 
 
 def apply_addon_env():

corio-2.2.0/corio/http.py → corio-2.2.1/corio/https.py

@@ -2,9 +2,9 @@ import httpx
 from functools import cached_property
 from httpx_retries import RetryTransport, Retry
 
-from corio import logging
+from corio import logs
 
-logging.logger.instrument_httpx()
+logs.logger.instrument_httpx()
 
 
 class Client(httpx.Client):

{corio-2.2.0 → corio-2.2.1}/corio/infra/incrementor_pyproject.py

@@ -5,7 +5,7 @@ from itertools import chain
 from corio.constants import Constants
 from corio.infra.releaser import Incrementor
 from corio.iterator import dedupe
-from corio.logging import logger
+from corio.logs import logger
 from corio.path import Path
 from corio.toml import ensure_table
 

{corio-2.2.0 → corio-2.2.1}/corio/infra/releaser.py

@@ -13,11 +13,11 @@ gh_deploy = cli.commands["gh-deploy"].callback
 serve = cli.commands["serve"].callback
 
 from corio import env as env
-from corio import http as http
+from corio import https as https
 from corio.constants import Constants
 from corio.infra.project import Project
 from corio.inherit import Inherit
-from corio.logging import logger
+from corio.logs import logger
 from corio.path import Path
 
 
@@ -367,7 +367,7 @@ class ReleaseGithub(Release):
         }
 
         with logger.span(f'Creating release "{name}"...'):
-            response = http.client.post(url, json=payload, headers=headers)
+            response = https.client.post(url, json=payload, headers=headers)
 
         response.raise_for_status()
 

{corio-2.2.0 → corio-2.2.1}/corio/infra/repository.py

@@ -3,7 +3,7 @@ from functools import cached_property
 from typing import Any
 
 from corio.inherit import Inherit
-from corio.logging import logger
+from corio.logs import logger
 from corio.path import Path
 
 

{corio-2.2.0 → corio-2.2.1}/corio/infra/stack.py

@@ -6,7 +6,7 @@ from corio.docker import DockerClient
 from corio.infra.project import Project
 from corio.inherit import Inherit
 from corio.iterator import IndexList
-from corio.logging import logger
+from corio.logs import logger
 from corio.merging import merge
 from corio.path import Path, PackagePaths
 

{corio-2.2.0 → corio-2.2.1}/corio/interface/controls.py

@@ -6,7 +6,7 @@ from flet.core.types import ColorValue, IconValue
 from functools import cached_property
 from typing import Optional
 
-from corio.logging import logger
+from corio.logs import logger
 
 
 class SliderSteps(ft.Slider):

{corio-2.2.0 → corio-2.2.1}/corio/interface/interface.py

@@ -9,7 +9,7 @@ from corio import env
 from corio.constants import Constants
 from corio.function import MethodDecorator
 from corio.interface.context import Context
-from corio.logging import logger
+from corio.logs import logger
 
 
 class update(MethodDecorator):

{corio-2.2.0 → corio-2.2.1}/corio/json_fix.py

@@ -1,7 +1,7 @@
 import json
 import json_repair
 
-from corio.logging import logger
+from corio.logs import logger
 from corio.tools import Raise
 
 

{corio-2.2.0 → corio-2.2.1}/corio/mqtt.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass, asdict
 from paho.mqtt.client import CleanStartOption, MQTT_CLEAN_START_FIRST_ONLY
 from typing import Literal, Self
 
-from corio.logging import logger, get_current_level, get_native_level_from_otel
+from corio.logs import logger, get_current_level, get_native_level_from_otel
 
 LOGGER = logging.getLogger("mqtt")
 LOGGER.handlers.clear()

{corio-2.2.0 → corio-2.2.1}/corio/parallel.py

@@ -6,7 +6,7 @@ from multiprocessing import cpu_count
 from typing import List, Callable, Any, Union
 
 from corio.iterator import dict_records_to_lists
-from corio.logging import logger
+from corio.logs import logger
 from corio.path import Path
 
 

{corio-2.2.0 → corio-2.2.1}/corio/path/path.py

@@ -15,8 +15,8 @@ from typing import Self, Tuple, Callable
 from typing import Union, Any
 
 from corio.constants import Constants
-from corio.platform import is_wsl
-from corio.string import join_natural
+from corio.plat import is_wsl
+from corio.strings import join_natural
 
 if typing.TYPE_CHECKING:
     from datetime import datetime, timezone
@@ -116,7 +116,7 @@ class Path(type(Path())):
         Write the specified object to the path as a JSON string
 
         """
-        from corio.json import to_json
+        from corio.jsn import to_json
         json_str = to_json(obj)
         return self.write_text(json_str, encoding=Constants.ENCODING)
 
@@ -126,7 +126,7 @@ class Path(type(Path())):
         Read JSON from the file and return as a Python object
 
         """
-        from corio.json import from_json
+        from corio.jsn import from_json
         json_str = self.read_text(encoding=Constants.ENCODING)
         obj = from_json(json_str)
         return obj
@@ -137,8 +137,8 @@ class Path(type(Path())):
         Write the specified object to the path as a JSON string
 
         """
-        from corio import yaml
-        yaml_str = yaml.to_yaml(obj)
+        from corio import yml
+        yaml_str = yml.to_yaml(obj)
         return self.write_text(yaml_str, encoding=Constants.ENCODING)
 
     def read_yaml(self) -> Any:
@@ -147,9 +147,9 @@ class Path(type(Path())):
         Read YAML from the file and return as a Python object
 
         """
-        from corio import yaml
+        from corio import yml
         yaml_str = self.read_text(encoding=Constants.ENCODING)
-        obj = yaml.from_yaml(yaml_str)
+        obj = yml.from_yaml(yaml_str)
         return obj
 
     def write_toml(self, obj) -> int:

{corio-2.2.0 → corio-2.2.1}/corio/patterns.py

@@ -5,8 +5,8 @@ from typing import List, Any
 import regex as re
 
 from corio import Constants
-from corio.logging import logger
-from corio.string import join
+from corio.logs import logger
+from corio.strings import join
 
 
 class RewriteCircularLoopError(Exception):

{corio-2.2.0 → corio-2.2.1}/corio/process.py

@@ -1,7 +1,7 @@
 import time
 from multiprocessing import Queue, Process
 
-from corio.logging import logger
+from corio.logs import logger
 
 
 class ContextProcess:

{corio-2.2.0 → corio-2.2.1}/corio/pyproject.package.toml

@@ -56,14 +56,15 @@ ha = ["env.io"]
 "ha.api" = ["ha", "homeassistant_api", "aiohasupervisor"]
 doc = ["mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav"]
 youtube = ["pytubefix"]
-infra = ["version.dev", "logging", "setup", "doc", "sets", "build", "twine", "packaging", "vcs", "docker.client", "merging", "http", "api", "tomlkit", "secrets"]
+infra = ["version.dev", "logging", "setup", "doc", "sets", "build", "twine", "packaging", "vcs", "docker.client", "merging", "http", "api", "tomlkit", "secrets", "cli"]
 vcs = ["pygit2"]
 tasmota = ["decode-config", "esptool"]
 encrypt = ["pyrage"]
 secrets = ["encrypt", "env.io", "yaml", "logging", "sets", "vcs"]
+cli = ["sets", "logging"]
 
 [tool.corio.metadata]
-version = "2.2.0"
+version = "2.2.1"
 port = 0
 base = "python"
 description = "Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML"
@@ -92,7 +93,7 @@ corio = ["pyproject.package.toml"]
 
 [project]
 name = "corio"
-version = "2.2.0"
+version = "2.2.1"
 description = "Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML"
 readme = "README.md"
 dependencies = []
@@ -158,6 +159,7 @@ vcs = ["pygit2"]
 tasmota = ["decode-config", "esptool"]
 encrypt = ["pyrage"]
 secrets = ["pyrage", "dotenv", "yamlscript", "pyyaml", "logfire", "pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "pygit2"]
+cli = ["pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "yamlscript", "pyyaml", "logfire"]
 all = ["logfire", "semver", "pydevd-pycharm~=251.25410.159", "pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "yamlscript", "pyyaml", "beanie", "setuptools", "mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav", "build", "twine", "packaging", "pygit2", "python-on-whales", "deepmerge", "httpx", "httpx_retries", "logfire[httpx]", "fastapi", "uvicorn[standard]", "logfire[fastapi]", "tomlkit", "pyrage", "dotenv", "pytest-cov", "dask[bag]", "distributed", "bokeh", "tokenizers", "faker", "sre_yield", "contexttimer", "Unidecode", "tinynetrc", "huggingface_hub", "peft", "transformers[sentencepiece]", "torchvision", "torchaudio", "cuda-bindings==13.2.0", "cuda-pathfinder==1.5.4", "cuda-toolkit==13.0.2", "nvidia-cublas==13.1.0.3", "nvidia-cuda-cupti==13.0.85", "nvidia-cuda-nvrtc==13.0.88", "nvidia-cuda-runtime==13.0.96", "nvidia-cudnn-cu13==9.19.0.56", "nvidia-cufft==12.0.0.61", "nvidia-cufile==1.15.1.6", "nvidia-curand==10.4.0.35", "nvidia-cusolver==12.0.4.66", "nvidia-cusparse==12.6.3.3", "nvidia-cusparselt-cu13==0.8.0", "nvidia-nccl-cu13==2.28.9", "nvidia-nvjitlink==13.0.88", "nvidia-nvshmem-cu13==3.4.5", "nvidia-nvtx==13.0.85", "torch==2.11.0", "triton==3.6.0", "openai", "pydantic-ai-slim[logfire,openai]", "ollama", "json_repair", "sentence_transformers", "pandas", "tabulate", "openpyxl", "odfpy", "deepdiff", "html2text", "flet[all] <0.80.0", "flet-video", "flet-webview", "google-auth", "google-auth-oauthlib", "google-auth-httplib2", "google-api-python-client", "diskcache", "cachetools", "pymupdf", "pymupdf4llm", "appdirs", "filetype", "dnspython[doh]", "regex", "playwright", "aiomqtt", "av", "homeassistant_api", "aiohasupervisor", "pytubefix", "decode-config", "esptool"]
 
 [[project.authors]]
@@ -168,15 +170,7 @@ email = "innovative.fowler@mask.pro.fmtr.dev"
 Homepage = "https://github.com/fmtr/corio"
 
 [project.scripts]
-corio-doc-serve = "corio.entrypoints.doc_serve:main"
-corio-pyproject = "corio.entrypoints.pyproject:main"
-corio-ep-test = "corio.entrypoints.ep_test:main"
-corio-shell-debug = "corio.entrypoints.shell_debug:main"
-corio-cache-hfh = "corio.entrypoints.cache_hfh:main"
-corio-infra = "corio.entrypoints.infra:main"
-corio-install-yamlscript = "corio.entrypoints.install_yamlscript:main"
-corio-secrets = "corio.entrypoints.secrets:main"
-corio-remote-debug-test = "corio.entrypoints.remote_debug_test:main"
+corio = "corio.entrypoint:main"
 
 [dependency-groups]
 dev = ["logfire", "semver", "pydevd-pycharm~=251.25410.159", "pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "yamlscript", "pyyaml", "beanie", "setuptools", "mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav", "build", "twine", "packaging", "pygit2", "python-on-whales", "deepmerge", "httpx", "httpx_retries", "logfire[httpx]", "fastapi", "uvicorn[standard]", "logfire[fastapi]", "tomlkit", "pyrage", "dotenv"]

corio-2.2.0/corio/random.py → corio-2.2.1/corio/rand.py

@@ -19,7 +19,6 @@ def temporary_seed(seed=0):
     Temporarily set random seed and revert
 
     """
-    import random
     state = random.getstate()
     random.seed(seed)
     try:

{corio-2.2.0 → corio-2.2.1}/corio/secrets.py

@@ -3,27 +3,33 @@ from __future__ import annotations
 from functools import cached_property
 from typing import ClassVar
 from typing import Generator
+from typing import TYPE_CHECKING
 
 from pydantic import Field
+from pydantic_settings import CLI_SUPPRESS
 from pydantic_settings import CliSubCommand
 
 from corio import dm as dm
 from corio import sets as sets
-from corio.encrypt import EncryptorValuesSelect, EncryptorValues
 from corio.iterator import flatten_tree, strip_none, IndexList
-from corio.logging import logger
+from corio.logs import logger
 from corio.path import Path
-from corio.string import join_natural, MASK_QUOTE
+from corio.strings import join_natural, MASK_QUOTE
+
+if TYPE_CHECKING:
+    from corio.encrypt import EncryptorValues, EncryptorValuesSelect
 
 ALL = '+'
 
+token_hex=None # FastAPI tries to import this?
+
 class Definition(dm.Base):
     """
 
     Pair of lists of files - and the nodes to encrypt within those files
 
     """
-    config: Config | None = Field(default=None, exclude=True, repr=False)
+    config: Cli | None = Field(default=None, exclude=True, repr=False, description=CLI_SUPPRESS)
     files: list[str]
     nodes: list[str] = Field(default_factory=list)
 
@@ -34,6 +40,8 @@ class Definition(dm.Base):
         Create encryptor with only the nodes specified
 
         """
+        from corio.encrypt import EncryptorValuesSelect
+
         return EncryptorValuesSelect(nodes=self.nodes)
 
     def is_keys_values_aligned(self, black_robin: dict) -> bool:
@@ -137,7 +145,7 @@ class Command(dm.Base):
     CLI subcommand base
 
     """
-    config: Config | None = Field(default=None, exclude=True, repr=False)
+    config: Cli | None = Field(default=None, exclude=True, repr=False, description=CLI_SUPPRESS)
     context: list[str]
 
     def is_black(self, path: Path) -> bool:
@@ -318,6 +326,8 @@ class Decrypt(Command):
         Decryption doesn't need definitions, so can use a generic values encryptor
 
         """
+        from corio.encrypt import EncryptorValues
+
         return EncryptorValues()
 
     def is_included_self_suffix(self, path: Path) -> bool:
@@ -359,7 +369,7 @@ class Decrypt(Command):
         return path_red
 
 
-class Config(sets.Base):
+class Cli(sets.Base):
     """
 
     Secrets encryptions definitions file in repo root

{corio-2.2.0 → corio-2.2.1}/corio/semantic.py

@@ -1,7 +1,7 @@
 import pandas as pd
 from sentence_transformers import SentenceTransformer
 
-from corio.logging import logger
+from corio.logs import logger
 
 
 class SemanticManager:

{corio-2.2.0 → corio-2.2.1}/corio/sets.py

@@ -51,9 +51,16 @@ class Base(BaseSettings, CliRunMixin):
 
         """
 
+        cli_parse_args = cls.model_config.get('cli_parse_args')
+        if cli_parse_args is None:
+            cli_parse_args = False
+
         sources = (
             init_settings,
-            CliSettingsSource(settings_cls, cli_parse_args=True),
+            CliSettingsSource(
+                settings_cls,
+                cli_parse_args=cli_parse_args,
+            ),
             EnvSettingsSource(settings_cls, env_prefix=cls.get_env_prefix(), env_nested_delimiter=cls.ENV_NESTED_DELIMITER),
             YamlScriptConfigSettingsSource(settings_cls, yaml_file=cls.find_yaml_file()),
         )

{corio-2.2.0 → corio-2.2.1}/corio/tests/test_json.py

@@ -1,4 +1,4 @@
-from corio import json
+from corio import jsn
 from corio.tests.helpers import SERIALIZATION_DATA
 
 
@@ -9,5 +9,5 @@ def test_json():
 
     """
     expected = SERIALIZATION_DATA
-    actual = json.from_json(json.to_json(expected))
+    actual = jsn.from_json(jsn.to_json(expected))
     assert actual == expected