pydantic2 #244
Merged
pydantic2 #244
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Release v0.10.4
Address docker compose issues (#232)
Optimize web interface fetching of PEP annotation data. New `/annotation` endpoint
Deploying with
|
| Latest commit: |
815876f
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://56920556.pephub.pages.dev |
| Branch Preview URL: | https://243-pydantic2.pephub.pages.dev |
nleroy917
approved these changes
Dec 11, 2023
Comment on lines
-15
to
-113
| from pephub.exceptions import PepHubException | ||
|
|
||
| from ._version import __version__ as v | ||
| from .const import DEFAULT_PORT, PKG_NAME | ||
|
|
||
|
|
||
| def build_parser(): | ||
| """ | ||
| Building argument parser | ||
| :return argparse.ArgumentParser | ||
| """ | ||
| banner = "%(prog)s - PEP web server" | ||
| additional_description = ( | ||
| "For subcommand-specific options, type: '%(prog)s <subcommand> -h'" | ||
| ) | ||
| additional_description += "\nhttps://github.com/pepkit/pepserver" | ||
|
|
||
| parser = VersionInHelpParser( | ||
| prog=PKG_NAME, description=banner, epilog=additional_description | ||
| ) | ||
|
|
||
| parser.add_argument( | ||
| "-V", "--version", action="version", version="%(prog)s {v}".format(v=v) | ||
| ) | ||
|
|
||
| msg_by_cmd = {"serve": "run the server"} | ||
|
|
||
| subparsers = parser.add_subparsers(dest="command") | ||
|
|
||
| def add_subparser(cmd, description): | ||
| return subparsers.add_parser(cmd, description=description, help=description) | ||
|
|
||
| sps = {} | ||
| # add arguments that are common for both subparsers | ||
| for cmd, desc in msg_by_cmd.items(): | ||
| sps[cmd] = add_subparser(cmd, desc) | ||
| sps[cmd].add_argument( | ||
| "-c", | ||
| "--config", | ||
| required=False, | ||
| dest="config", | ||
| help="A path to the pepserver config file", | ||
| ) | ||
|
|
||
| sps["serve"].add_argument( | ||
| "-p", | ||
| "--port", | ||
| dest="port", | ||
| type=int, | ||
| help="The port the webserver should be run on.", | ||
| default=DEFAULT_PORT, | ||
| ) | ||
|
|
||
| sps["serve"].add_argument( | ||
| "-r", | ||
| "--reload", | ||
| dest="reload", | ||
| type=bool, | ||
| help="Run the server in reload configuration", | ||
| default=False, | ||
| ) | ||
|
|
||
| sps["serve"].add_argument( | ||
| "--log-level", | ||
| dest="log_level", | ||
| type=str, | ||
| help="The level of logging to use", | ||
| default="INFO", | ||
| ) | ||
|
|
||
| sps["serve"].add_argument( | ||
| "--uvicorn-log-level", | ||
| dest="uvicorn_log_level", | ||
| type=str, | ||
| help="The level of logging to use for uvicorn", | ||
| default="info", | ||
| ) | ||
|
|
||
| return parser | ||
|
|
||
|
|
||
| def read_server_configuration(path: str) -> dict: | ||
| """Read in a server configuration file at a specified path""" | ||
| if not exists(path): | ||
| raise FileNotFoundError(f"Configuration file at {path} could not be found.") | ||
| with open(path, "r") as f: | ||
| cfg = safe_load(f) | ||
| if cfg.get("data") is None: | ||
| raise PepHubException( | ||
| "'data' section is required in the configuration file." | ||
| ) | ||
| if cfg["data"].get("path") is None: | ||
| raise PepHubException( | ||
| "No path to PEPs was specified in the configuration file." | ||
| ) | ||
|
|
||
| return { | ||
| "data": {"path": cfg["data"]["path"], "index": cfg["data"].get("index")} | ||
| } |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updated models to pydantic 2