From 7a9f7bd3b8120e97bc3cdd899311e30b42771f99 Mon Sep 17 00:00:00 2001 From: Jonathan Green Date: Wed, 6 Mar 2024 15:36:42 -0400 Subject: [PATCH] Change package name (#13) * Change package name * Update readme --- README.md | 2 +- pyproject.toml | 18 +++++++++--------- {client_utils => src/palace_tools}/__init__.py | 0 .../palace_tools}/cli/__init__.py | 0 .../palace_tools}/cli/download_lcp_manifest.py | 14 +++++++------- .../palace_tools}/cli/palace_terminal.py | 2 +- .../palace_tools}/cli/palace_terminal.tcss | 0 .../palace_tools}/cli/patron_bookshelf.py | 10 +++++----- .../cli/summarize_rwpm_audio_manifest.py | 6 +++--- .../palace_tools}/cli/validate_manifests.py | 8 ++++---- .../palace_tools}/constants.py | 0 .../palace_tools}/models/__init__.py | 0 .../palace_tools}/models/api/__init__.py | 0 .../models/api/authentication_document.py | 6 +++--- .../palace_tools}/models/api/opds2.py | 6 +++--- .../palace_tools}/models/api/patron_profile.py | 4 ++-- .../models/api/readium_lcp_license_v1.py | 4 ++-- .../palace_tools}/models/api/rwpm_audiobook.py | 0 .../palace_tools}/models/api/util.py | 0 .../palace_tools}/models/internal/__init__.py | 0 .../palace_tools}/models/internal/bookshelf.py | 2 +- .../models/internal/rwpm_audio/__init__.py | 0 .../internal/rwpm_audio/audio_segment.py | 4 ++-- .../models/internal/rwpm_audio/audiobook.py | 4 ++-- {client_utils => src/palace_tools}/py.typed | 0 .../palace_tools}/roles/__init__.py | 0 .../palace_tools}/roles/patron.py | 14 +++++++------- .../palace_tools}/services/__init__.py | 0 .../palace_tools}/services/registry.py | 6 +++--- .../palace_tools}/utils/__init__.py | 0 .../palace_tools}/utils/datetime.py | 0 .../palace_tools}/utils/http/__init__.py | 0 .../palace_tools}/utils/http/async_client.py | 2 +- .../palace_tools}/utils/http/auth_token.py | 4 ++-- .../palace_tools}/utils/http/streaming.py | 2 +- .../palace_tools}/utils/iteration.py | 0 .../palace_tools}/utils/misc.py | 0 .../palace_tools}/utils/typer.py | 0 38 files changed, 59 insertions(+), 59 deletions(-) rename {client_utils => src/palace_tools}/__init__.py (100%) rename {client_utils => src/palace_tools}/cli/__init__.py (100%) rename {client_utils => src/palace_tools}/cli/download_lcp_manifest.py (87%) rename {client_utils => src/palace_tools}/cli/palace_terminal.py (99%) rename {client_utils => src/palace_tools}/cli/palace_terminal.tcss (100%) rename {client_utils => src/palace_tools}/cli/patron_bookshelf.py (91%) rename {client_utils => src/palace_tools}/cli/summarize_rwpm_audio_manifest.py (97%) rename {client_utils => src/palace_tools}/cli/validate_manifests.py (95%) rename {client_utils => src/palace_tools}/constants.py (100%) rename {client_utils => src/palace_tools}/models/__init__.py (100%) rename {client_utils => src/palace_tools}/models/api/__init__.py (100%) rename {client_utils => src/palace_tools}/models/api/authentication_document.py (89%) rename {client_utils => src/palace_tools}/models/api/opds2.py (96%) rename {client_utils => src/palace_tools}/models/api/patron_profile.py (85%) rename {client_utils => src/palace_tools}/models/api/readium_lcp_license_v1.py (87%) rename {client_utils => src/palace_tools}/models/api/rwpm_audiobook.py (100%) rename {client_utils => src/palace_tools}/models/api/util.py (100%) rename {client_utils => src/palace_tools}/models/internal/__init__.py (100%) rename {client_utils => src/palace_tools}/models/internal/bookshelf.py (94%) rename {client_utils => src/palace_tools}/models/internal/rwpm_audio/__init__.py (100%) rename {client_utils => src/palace_tools}/models/internal/rwpm_audio/audio_segment.py (97%) rename {client_utils => src/palace_tools}/models/internal/rwpm_audio/audiobook.py (97%) rename {client_utils => src/palace_tools}/py.typed (100%) rename {client_utils => src/palace_tools}/roles/__init__.py (100%) rename {client_utils => src/palace_tools}/roles/patron.py (94%) rename {client_utils => src/palace_tools}/services/__init__.py (100%) rename {client_utils => src/palace_tools}/services/registry.py (89%) rename {client_utils => src/palace_tools}/utils/__init__.py (100%) rename {client_utils => src/palace_tools}/utils/datetime.py (100%) rename {client_utils => src/palace_tools}/utils/http/__init__.py (100%) rename {client_utils => src/palace_tools}/utils/http/async_client.py (96%) rename {client_utils => src/palace_tools}/utils/http/auth_token.py (96%) rename {client_utils => src/palace_tools}/utils/http/streaming.py (98%) rename {client_utils => src/palace_tools}/utils/iteration.py (100%) rename {client_utils => src/palace_tools}/utils/misc.py (100%) rename {client_utils => src/palace_tools}/utils/typer.py (100%) diff --git a/README.md b/README.md index 5ac46e7..c1d0a1d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Palace Client Utilities +# Palace Tools 🛠️ [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/) diff --git a/pyproject.toml b/pyproject.toml index 97e99b4..cbb0055 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ requires = ["poetry-core"] profile = "black" [tool.mypy] -files = ["."] +files = ["src"] plugins = ["pydantic.mypy"] warn_redundant_casts = true warn_unreachable = true @@ -21,11 +21,11 @@ module = [ [tool.poetry] authors = ["The Palace Project "] -description = "Palace Client Utilities" +description = "Palace Tools" homepage = "https://thepalaceproject.org" license = "Apache-2.0" -name = "palace-client-utils" -packages = [{include = "client_utils"}] +name = "palace-tools" +packages = [{include = "palace_tools", from = "src"}] readme = "README.md" version = "0" @@ -49,11 +49,11 @@ mypy = "^1.8.0" types-pytz = "^2024.1.0.20240203" [tool.poetry.scripts] -audiobook-manifest-summary = "client_utils.cli.summarize_rwpm_audio_manifest:main" -fetch-lcp-audiobook-manifest = "client_utils.cli.download_lcp_manifest:main" -palace-terminal = "client_utils.cli.palace_terminal:main" -patron-bookshelf = "client_utils.cli.patron_bookshelf:main" -validate-audiobook-manifests = "client_utils.cli.validate_manifests:main" +audiobook-manifest-summary = "palace_tools.cli.summarize_rwpm_audio_manifest:main" +fetch-lcp-audiobook-manifest = "palace_tools.cli.download_lcp_manifest:main" +palace-terminal = "palace_tools.cli.palace_terminal:main" +patron-bookshelf = "palace_tools.cli.patron_bookshelf:main" +validate-audiobook-manifests = "palace_tools.cli.validate_manifests:main" [tool.tomlsort] ignore_case = true diff --git a/client_utils/__init__.py b/src/palace_tools/__init__.py similarity index 100% rename from client_utils/__init__.py rename to src/palace_tools/__init__.py diff --git a/client_utils/cli/__init__.py b/src/palace_tools/cli/__init__.py similarity index 100% rename from client_utils/cli/__init__.py rename to src/palace_tools/cli/__init__.py diff --git a/client_utils/cli/download_lcp_manifest.py b/src/palace_tools/cli/download_lcp_manifest.py similarity index 87% rename from client_utils/cli/download_lcp_manifest.py rename to src/palace_tools/cli/download_lcp_manifest.py index 47f9ed7..ef486d8 100755 --- a/client_utils/cli/download_lcp_manifest.py +++ b/src/palace_tools/cli/download_lcp_manifest.py @@ -10,13 +10,13 @@ import typer -from client_utils.constants import LCP_AUDIOBOOK_TYPE, LCP_LICENSE_PUBLICATION_REL -from client_utils.models.api.opds2 import match_links -from client_utils.models.api.readium_lcp_license_v1 import LCPLicenseDocument -from client_utils.utils.http.async_client import HTTPXAsyncClient -from client_utils.utils.http.auth_token import BaseAuthorizationToken, BasicAuthToken -from client_utils.utils.http.streaming import streaming_fetch_with_progress -from client_utils.utils.typer import run_typer_app_as_main +from palace_tools.constants import LCP_AUDIOBOOK_TYPE, LCP_LICENSE_PUBLICATION_REL +from palace_tools.models.api.opds2 import match_links +from palace_tools.models.api.readium_lcp_license_v1 import LCPLicenseDocument +from palace_tools.utils.http.async_client import HTTPXAsyncClient +from palace_tools.utils.http.auth_token import BaseAuthorizationToken, BasicAuthToken +from palace_tools.utils.http.streaming import streaming_fetch_with_progress +from palace_tools.utils.typer import run_typer_app_as_main STDOUT = 1 app = typer.Typer() diff --git a/client_utils/cli/palace_terminal.py b/src/palace_tools/cli/palace_terminal.py similarity index 99% rename from client_utils/cli/palace_terminal.py rename to src/palace_tools/cli/palace_terminal.py index 0a4f00d..baaabec 100644 --- a/client_utils/cli/palace_terminal.py +++ b/src/palace_tools/cli/palace_terminal.py @@ -14,7 +14,7 @@ from textual.containers import Center, Horizontal from textual.widgets import DataTable, Footer, Header, Label, ProgressBar -from client_utils.models.api.rwpm_audiobook import Manifest +from palace_tools.models.api.rwpm_audiobook import Manifest def ms_to_hms(ms: int) -> str: diff --git a/client_utils/cli/palace_terminal.tcss b/src/palace_tools/cli/palace_terminal.tcss similarity index 100% rename from client_utils/cli/palace_terminal.tcss rename to src/palace_tools/cli/palace_terminal.tcss diff --git a/client_utils/cli/patron_bookshelf.py b/src/palace_tools/cli/patron_bookshelf.py similarity index 91% rename from client_utils/cli/patron_bookshelf.py rename to src/palace_tools/cli/patron_bookshelf.py index b672fd8..75dc7ca 100755 --- a/client_utils/cli/patron_bookshelf.py +++ b/src/palace_tools/cli/patron_bookshelf.py @@ -5,11 +5,11 @@ import typer -from client_utils.constants import DEFAULT_REGISTRY_URL -from client_utils.models.internal.bookshelf import print_bookshelf_summary -from client_utils.roles.patron import authenticate -from client_utils.utils.http.async_client import HTTPXAsyncClient -from client_utils.utils.typer import run_typer_app_as_main +from palace_tools.constants import DEFAULT_REGISTRY_URL +from palace_tools.models.internal.bookshelf import print_bookshelf_summary +from palace_tools.roles.patron import authenticate +from palace_tools.utils.http.async_client import HTTPXAsyncClient +from palace_tools.utils.typer import run_typer_app_as_main app = typer.Typer(rich_markup_mode="rich") diff --git a/client_utils/cli/summarize_rwpm_audio_manifest.py b/src/palace_tools/cli/summarize_rwpm_audio_manifest.py similarity index 97% rename from client_utils/cli/summarize_rwpm_audio_manifest.py rename to src/palace_tools/cli/summarize_rwpm_audio_manifest.py index 4001253..f9dcf6d 100755 --- a/client_utils/cli/summarize_rwpm_audio_manifest.py +++ b/src/palace_tools/cli/summarize_rwpm_audio_manifest.py @@ -7,9 +7,9 @@ import typer -from client_utils.models.internal.rwpm_audio.audiobook import Audiobook -from client_utils.utils.datetime import seconds_to_hms -from client_utils.utils.typer import run_typer_app_as_main +from palace_tools.models.internal.rwpm_audio.audiobook import Audiobook +from palace_tools.utils.datetime import seconds_to_hms +from palace_tools.utils.typer import run_typer_app_as_main app = typer.Typer() diff --git a/client_utils/cli/validate_manifests.py b/src/palace_tools/cli/validate_manifests.py similarity index 95% rename from client_utils/cli/validate_manifests.py rename to src/palace_tools/cli/validate_manifests.py index b301943..4d4f1da 100644 --- a/client_utils/cli/validate_manifests.py +++ b/src/palace_tools/cli/validate_manifests.py @@ -5,10 +5,10 @@ import typer from pydantic import ValidationError -from client_utils.cli.summarize_rwpm_audio_manifest import text_with_time_delta -from client_utils.models.internal.rwpm_audio.audiobook import Audiobook -from client_utils.utils.datetime import seconds_to_hms -from client_utils.utils.typer import run_typer_app_as_main +from palace_tools.cli.summarize_rwpm_audio_manifest import text_with_time_delta +from palace_tools.models.internal.rwpm_audio.audiobook import Audiobook +from palace_tools.utils.datetime import seconds_to_hms +from palace_tools.utils.typer import run_typer_app_as_main app = typer.Typer() diff --git a/client_utils/constants.py b/src/palace_tools/constants.py similarity index 100% rename from client_utils/constants.py rename to src/palace_tools/constants.py diff --git a/client_utils/models/__init__.py b/src/palace_tools/models/__init__.py similarity index 100% rename from client_utils/models/__init__.py rename to src/palace_tools/models/__init__.py diff --git a/client_utils/models/api/__init__.py b/src/palace_tools/models/api/__init__.py similarity index 100% rename from client_utils/models/api/__init__.py rename to src/palace_tools/models/api/__init__.py diff --git a/client_utils/models/api/authentication_document.py b/src/palace_tools/models/api/authentication_document.py similarity index 89% rename from client_utils/models/api/authentication_document.py rename to src/palace_tools/models/api/authentication_document.py index fd115bd..ba31ecb 100644 --- a/client_utils/models/api/authentication_document.py +++ b/src/palace_tools/models/api/authentication_document.py @@ -2,9 +2,9 @@ from collections.abc import Mapping -from client_utils.constants import PATRON_BOOKSHELF_REL, PATRON_PROFILE_REL -from client_utils.models.api.opds2 import OPDS2Link, match_links -from client_utils.models.api.util import ApiBaseModel +from palace_tools.constants import PATRON_BOOKSHELF_REL, PATRON_PROFILE_REL +from palace_tools.models.api.opds2 import OPDS2Link, match_links +from palace_tools.models.api.util import ApiBaseModel class Labels(ApiBaseModel): diff --git a/client_utils/models/api/opds2.py b/src/palace_tools/models/api/opds2.py similarity index 96% rename from client_utils/models/api/opds2.py rename to src/palace_tools/models/api/opds2.py index 644e7a0..a9665a5 100644 --- a/client_utils/models/api/opds2.py +++ b/src/palace_tools/models/api/opds2.py @@ -3,13 +3,13 @@ from pydantic import Field -from client_utils.constants import ( +from palace_tools.constants import ( OPDS_ACQ_OPEN_ACCESS_REL, OPDS_ACQ_STANDARD_REL, OPDS_REVOKE_REL, ) -from client_utils.models.api.util import ApiBaseModel -from client_utils.utils.misc import ensure_list +from palace_tools.models.api.util import ApiBaseModel +from palace_tools.utils.misc import ensure_list """ https://drafts.opds.io/opds-2.0.html diff --git a/client_utils/models/api/patron_profile.py b/src/palace_tools/models/api/patron_profile.py similarity index 85% rename from client_utils/models/api/patron_profile.py rename to src/palace_tools/models/api/patron_profile.py index 26bad44..cc1f034 100644 --- a/client_utils/models/api/patron_profile.py +++ b/src/palace_tools/models/api/patron_profile.py @@ -1,7 +1,7 @@ from pydantic import Field -from client_utils.models.api.opds2 import OPDS2Link -from client_utils.models.api.util import ApiBaseModel +from palace_tools.models.api.opds2 import OPDS2Link +from palace_tools.models.api.util import ApiBaseModel class Settings(ApiBaseModel): diff --git a/client_utils/models/api/readium_lcp_license_v1.py b/src/palace_tools/models/api/readium_lcp_license_v1.py similarity index 87% rename from client_utils/models/api/readium_lcp_license_v1.py rename to src/palace_tools/models/api/readium_lcp_license_v1.py index 4fbc964..0f18b94 100644 --- a/client_utils/models/api/readium_lcp_license_v1.py +++ b/src/palace_tools/models/api/readium_lcp_license_v1.py @@ -2,8 +2,8 @@ from collections.abc import Sequence -from client_utils.models.api.opds2 import OPDS2Link -from client_utils.models.api.util import ApiBaseModel +from palace_tools.models.api.opds2 import OPDS2Link +from palace_tools.models.api.util import ApiBaseModel class ContentKey(ApiBaseModel): diff --git a/client_utils/models/api/rwpm_audiobook.py b/src/palace_tools/models/api/rwpm_audiobook.py similarity index 100% rename from client_utils/models/api/rwpm_audiobook.py rename to src/palace_tools/models/api/rwpm_audiobook.py diff --git a/client_utils/models/api/util.py b/src/palace_tools/models/api/util.py similarity index 100% rename from client_utils/models/api/util.py rename to src/palace_tools/models/api/util.py diff --git a/client_utils/models/internal/__init__.py b/src/palace_tools/models/internal/__init__.py similarity index 100% rename from client_utils/models/internal/__init__.py rename to src/palace_tools/models/internal/__init__.py diff --git a/client_utils/models/internal/bookshelf.py b/src/palace_tools/models/internal/bookshelf.py similarity index 94% rename from client_utils/models/internal/bookshelf.py rename to src/palace_tools/models/internal/bookshelf.py index 7f8d930..5a00269 100644 --- a/client_utils/models/internal/bookshelf.py +++ b/src/palace_tools/models/internal/bookshelf.py @@ -1,4 +1,4 @@ -from client_utils.models.api.opds2 import OPDS2Feed +from palace_tools.models.api.opds2 import OPDS2Feed def print_bookshelf_summary(bookshelf: OPDS2Feed) -> None: diff --git a/client_utils/models/internal/rwpm_audio/__init__.py b/src/palace_tools/models/internal/rwpm_audio/__init__.py similarity index 100% rename from client_utils/models/internal/rwpm_audio/__init__.py rename to src/palace_tools/models/internal/rwpm_audio/__init__.py diff --git a/client_utils/models/internal/rwpm_audio/audio_segment.py b/src/palace_tools/models/internal/rwpm_audio/audio_segment.py similarity index 97% rename from client_utils/models/internal/rwpm_audio/audio_segment.py rename to src/palace_tools/models/internal/rwpm_audio/audio_segment.py index 269e1d7..691924d 100644 --- a/client_utils/models/internal/rwpm_audio/audio_segment.py +++ b/src/palace_tools/models/internal/rwpm_audio/audio_segment.py @@ -3,8 +3,8 @@ from collections.abc import Generator, Iterable, Sequence from dataclasses import dataclass, field -from client_utils.models.api.rwpm_audiobook import AudioTrack, ToCEntry -from client_utils.utils.iteration import sliding_window +from palace_tools.models.api.rwpm_audiobook import AudioTrack, ToCEntry +from palace_tools.utils.iteration import sliding_window @dataclass diff --git a/client_utils/models/internal/rwpm_audio/audiobook.py b/src/palace_tools/models/internal/rwpm_audio/audiobook.py similarity index 97% rename from client_utils/models/internal/rwpm_audio/audiobook.py rename to src/palace_tools/models/internal/rwpm_audio/audiobook.py index b88ee3e..a6cf928 100644 --- a/client_utils/models/internal/rwpm_audio/audiobook.py +++ b/src/palace_tools/models/internal/rwpm_audio/audiobook.py @@ -8,8 +8,8 @@ from mutagen.mp3 import MP3 -from client_utils.models.api.rwpm_audiobook import Manifest, ToCEntry -from client_utils.models.internal.rwpm_audio.audio_segment import ( +from palace_tools.models.api.rwpm_audiobook import Manifest, ToCEntry +from palace_tools.models.internal.rwpm_audio.audio_segment import ( AudioSegment, audio_segments_for_all_toc_entries, audio_segments_for_toc_entry, diff --git a/client_utils/py.typed b/src/palace_tools/py.typed similarity index 100% rename from client_utils/py.typed rename to src/palace_tools/py.typed diff --git a/client_utils/roles/__init__.py b/src/palace_tools/roles/__init__.py similarity index 100% rename from client_utils/roles/__init__.py rename to src/palace_tools/roles/__init__.py diff --git a/client_utils/roles/patron.py b/src/palace_tools/roles/patron.py similarity index 94% rename from client_utils/roles/patron.py rename to src/palace_tools/roles/patron.py index cf28f11..1721d83 100644 --- a/client_utils/roles/patron.py +++ b/src/palace_tools/roles/patron.py @@ -4,22 +4,22 @@ from dataclasses import dataclass from enum import Enum -from client_utils.constants import ( +from palace_tools.constants import ( DEFAULT_AUTH_DOC_PATH_SUFFIX, DEFAULT_REGISTRY_URL, OPDS_2_TYPE, PATRON_AUTH_BASIC_TOKEN_TYPE, PATRON_AUTH_BASIC_TYPE, ) -from client_utils.models.api.authentication_document import ( +from palace_tools.models.api.authentication_document import ( AuthenticationDocument, AuthenticationMechanism, ) -from client_utils.models.api.opds2 import OPDS2Feed, match_links -from client_utils.models.api.patron_profile import PatronProfileDocument -from client_utils.services.registry import LibraryRegistryService -from client_utils.utils.http.async_client import HTTPXAsyncClient, validate_response -from client_utils.utils.http.auth_token import ( +from palace_tools.models.api.opds2 import OPDS2Feed, match_links +from palace_tools.models.api.patron_profile import PatronProfileDocument +from palace_tools.services.registry import LibraryRegistryService +from palace_tools.utils.http.async_client import HTTPXAsyncClient, validate_response +from palace_tools.utils.http.auth_token import ( AuthorizationToken, BasicAuthToken, OAuthToken, diff --git a/client_utils/services/__init__.py b/src/palace_tools/services/__init__.py similarity index 100% rename from client_utils/services/__init__.py rename to src/palace_tools/services/__init__.py diff --git a/client_utils/services/registry.py b/src/palace_tools/services/registry.py similarity index 89% rename from client_utils/services/registry.py rename to src/palace_tools/services/registry.py index 31aa51e..288a6e7 100644 --- a/client_utils/services/registry.py +++ b/src/palace_tools/services/registry.py @@ -1,8 +1,8 @@ from __future__ import annotations -from client_utils.constants import OPDS_AUTH_DOC_REL, OPDS_AUTH_DOC_TYPE -from client_utils.models.api.opds2 import match_links -from client_utils.utils.http.async_client import HTTPXAsyncClient, validate_response +from palace_tools.constants import OPDS_AUTH_DOC_REL, OPDS_AUTH_DOC_TYPE +from palace_tools.models.api.opds2 import match_links +from palace_tools.utils.http.async_client import HTTPXAsyncClient, validate_response class LibraryRegistryService: diff --git a/client_utils/utils/__init__.py b/src/palace_tools/utils/__init__.py similarity index 100% rename from client_utils/utils/__init__.py rename to src/palace_tools/utils/__init__.py diff --git a/client_utils/utils/datetime.py b/src/palace_tools/utils/datetime.py similarity index 100% rename from client_utils/utils/datetime.py rename to src/palace_tools/utils/datetime.py diff --git a/client_utils/utils/http/__init__.py b/src/palace_tools/utils/http/__init__.py similarity index 100% rename from client_utils/utils/http/__init__.py rename to src/palace_tools/utils/http/__init__.py diff --git a/client_utils/utils/http/async_client.py b/src/palace_tools/utils/http/async_client.py similarity index 96% rename from client_utils/utils/http/async_client.py rename to src/palace_tools/utils/http/async_client.py index 11922aa..c9d0fa1 100644 --- a/client_utils/utils/http/async_client.py +++ b/src/palace_tools/utils/http/async_client.py @@ -5,7 +5,7 @@ from httpx import AsyncClient, Response -from client_utils.constants import DEFAULT_USER_AGENT +from palace_tools.constants import DEFAULT_USER_AGENT if sys.version_info < (3, 11): from typing_extensions import Self diff --git a/client_utils/utils/http/auth_token.py b/src/palace_tools/utils/http/auth_token.py similarity index 96% rename from client_utils/utils/http/auth_token.py rename to src/palace_tools/utils/http/auth_token.py index 52b5448..422b755 100644 --- a/client_utils/utils/http/auth_token.py +++ b/src/palace_tools/utils/http/auth_token.py @@ -6,8 +6,8 @@ from functools import cached_property from typing import Protocol -from client_utils.models.api.util import ApiBaseModel -from client_utils.utils.datetime import utc_now +from palace_tools.models.api.util import ApiBaseModel +from palace_tools.utils.datetime import utc_now if sys.version_info < (3, 11): from typing_extensions import Self diff --git a/client_utils/utils/http/streaming.py b/src/palace_tools/utils/http/streaming.py similarity index 98% rename from client_utils/utils/http/streaming.py rename to src/palace_tools/utils/http/streaming.py index 52bf7dc..73b48d2 100644 --- a/client_utils/utils/http/streaming.py +++ b/src/palace_tools/utils/http/streaming.py @@ -4,7 +4,7 @@ import rich.progress from httpx import Response -from client_utils.utils.http.async_client import HTTPXAsyncClient +from palace_tools.utils.http.async_client import HTTPXAsyncClient DEFAULT_PROGRESS_BAR_TASK_NAME = "" diff --git a/client_utils/utils/iteration.py b/src/palace_tools/utils/iteration.py similarity index 100% rename from client_utils/utils/iteration.py rename to src/palace_tools/utils/iteration.py diff --git a/client_utils/utils/misc.py b/src/palace_tools/utils/misc.py similarity index 100% rename from client_utils/utils/misc.py rename to src/palace_tools/utils/misc.py diff --git a/client_utils/utils/typer.py b/src/palace_tools/utils/typer.py similarity index 100% rename from client_utils/utils/typer.py rename to src/palace_tools/utils/typer.py