Skip to content
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

cli: add --plain-http option #6

Merged
merged 2 commits into from
Aug 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions e2e/test_cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ pip install dist/omlmd-*.whl

echo "Running E2E test for CLI ..."

omlmd push localhost:5001/mmortari/mlartifact:v1 README.md --metadata tests/data/md.json
omlmd push localhost:5001/mmortari/mlartifact:v1 README.md --metadata tests/data/md.json --plain-http

omlmd pull localhost:5001/mmortari/mlartifact:v1 -o tmp/a
omlmd pull localhost:5001/mmortari/mlartifact:v1 -o tmp/a --plain-http
file_count=$(find "tmp/a" -type f | wc -l)
if [ "$file_count" -eq 3 ]; then
echo "Expected 3 files in $DIR, ok."
Expand All @@ -23,7 +23,7 @@ else
exit 1
fi

omlmd pull localhost:5001/mmortari/mlartifact:v1 -o tmp/b --media-types "application/x-mlmodel"
omlmd pull localhost:5001/mmortari/mlartifact:v1 -o tmp/b --media-types "application/x-mlmodel" --plain-http
file_count=$(find "tmp/b" -type f | wc -l)
if [ "$file_count" -eq 1 ]; then
echo "Expected 1 files in $DIR, ok."
Expand All @@ -32,9 +32,9 @@ else
exit 1
fi

omlmd get config localhost:5001/mmortari/mlartifact:v1
omlmd crawl localhost:5001/mmortari/mlartifact:v1 localhost:5001/mmortari/mlartifact:v1 | jq .
omlmd crawl \
omlmd get config localhost:5001/mmortari/mlartifact:v1 --plain-http
omlmd crawl localhost:5001/mmortari/mlartifact:v1 localhost:5001/mmortari/mlartifact:v1 --plain-http | jq .
omlmd crawl --plain-http \
localhost:5001/mmortari/mlartifact:v1 \
localhost:5001/mmortari/mlartifact:v1 \
localhost:5001/mmortari/mlartifact:v1 \
Expand Down
29 changes: 21 additions & 8 deletions omlmd/cli.py
Original file line number Diff line number Diff line change
@@ -1,46 +1,59 @@
# Using this to scope CLI targets
import click
from omlmd.helpers import Helper
from omlmd.provider import OMLMDRegistry
from omlmd.model_metadata import deserialize_mdfile


plain_http = click.option('--plain-http', help="allow insecure connections to registry without SSL check", is_flag=True, default=False, show_default=True)


def get_OMLMDRegistry(plain_http: bool) -> OMLMDRegistry:
return OMLMDRegistry(insecure=plain_http)


@click.group()
def cli():
pass

@click.command()
@plain_http
@click.argument('target', required=True)
@click.option('-o', '--output', default='.', show_default=True)
@click.option('--media-types', '-m', multiple=True, default=[])
def pull(target, output, media_types):
def pull(plain_http, target, output, media_types):
"""Pulls an OCI Artifact containing ML model and metadata, filtering if necessary."""
Helper().pull(target, output, media_types)
Helper(get_OMLMDRegistry(plain_http)).pull(target, output, media_types)

@click.group()
def get():
pass

@click.command()
@plain_http
@click.argument('target', required=True)
def config(target):
def config(plain_http, target):
"""Outputs configuration of the given OCI Artifact for ML model and metadata."""
click.echo(Helper().get_config(target))
click.echo(Helper(get_OMLMDRegistry(plain_http)).get_config(target))

@click.command()
@plain_http
@click.argument('targets', required=True, nargs=-1)
def crawl(targets):
def crawl(plain_http, targets):
"""Crawls configuration for the given list of OCI Artifact for ML model and metadata."""
click.echo(Helper().crawl(targets))
click.echo(Helper(get_OMLMDRegistry(plain_http)).crawl(targets))

@click.command()
@plain_http
@click.argument('target', required=True)
@click.argument('path', required=True, type=click.Path())
@click.option('-m', '--metadata', required=True, type=click.Path())
def push(target, path, metadata):
def push(plain_http, target, path, metadata):
"""Pushes an OCI Artifact containing ML model and metadata, supplying metadata from file as necessary"""
import logging
logging.basicConfig(level=logging.DEBUG)
md = deserialize_mdfile(metadata)
click.echo(Helper().push(target, path, **md))
click.echo(Helper(get_OMLMDRegistry(plain_http)).push(target, path, **md))

cli.add_command(pull)
cli.add_command(get)
Expand Down
Loading