-
Notifications
You must be signed in to change notification settings - Fork 25
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add request and jsonschema optional dependencies #156
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,7 +20,11 @@ keywords=["stac", "pydantic", "validation"] | |
authors=[{ name = "Arturo Engineering", email = "[email protected]"}] | ||
license= { text = "MIT" } | ||
requires-python=">=3.8" | ||
dependencies = ["click>=8.1.7", "pydantic>=2.4.1", "geojson-pydantic>=1.0.0"] | ||
dependencies = [ | ||
"click>=8.1.7", | ||
"pydantic>=2.4.1", | ||
"geojson-pydantic>=1.0.0", | ||
] | ||
dynamic = ["version", "readme"] | ||
|
||
[project.scripts] | ||
|
@@ -31,6 +35,8 @@ homepage = "https://github.com/stac-utils/stac-pydantic" | |
repository ="https://github.com/stac-utils/stac-pydantic.git" | ||
|
||
[project.optional-dependencies] | ||
validation = ["jsonschema>=4.19.1", "requests>=2.31.0"] | ||
|
||
dev = [ | ||
"pytest>=7.4.2", | ||
"pytest-cov>=4.1.0", | ||
|
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,16 @@ | |
from stac_pydantic.extensions import validate_extensions | ||
from stac_pydantic.item import Item | ||
|
||
try: | ||
import requests | ||
except ImportError: # pragma: nocover | ||
requests = None # type: ignore | ||
|
||
try: | ||
import jsonschema | ||
except ImportError: # pragma: nocover | ||
jsonschema = None # type: ignore | ||
|
||
|
||
@click.group(short_help="Validate STAC") | ||
def app() -> None: | ||
|
@@ -16,14 +26,19 @@ def app() -> None: | |
@click.argument("infile") | ||
def validate_item(infile: str) -> None: | ||
"""Validate stac item""" | ||
assert requests is not None, "requests must be installed to validate items" | ||
assert jsonschema is not None, "jsonschema must be installed to validate items" | ||
|
||
r = requests.get(infile) | ||
r.raise_for_status() | ||
|
||
stac_item = r.json() | ||
try: | ||
item = Item(**stac_item) | ||
item = Item.model_validate(stac_item) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. model_validate is the recommended way of parsing/validating an object |
||
validate_extensions(item, reraise_exception=True) | ||
except ValidationError as e: | ||
click.echo(str(e)) | ||
return | ||
|
||
click.echo(f"{infile} is valid") | ||
return |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use
mode="json"
instead of model_dump_json + json.loads