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.

Sign up for GitHub

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

typos & clarifications in rest generator #430

Merged
merged 1 commit into from
Jan 23, 2024
Merged

typos & clarifications in rest generator #430

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 20 additions & 10 deletions garak/generators/rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class RESTRateLimitError(Exception):
class RestGenerator(Generator):
"""Generic API interface for REST models

Uses the following options from _config.run.generators["rest"]:
Uses the following options from _config.run.generators["rest.RestGenerator"]:
* uri - (optional) the URI of the REST endpoint; this can also be passed
in --model_name
* name - a short name for this service; defaults to the uri
Expand Down Expand Up @@ -112,7 +112,7 @@ def __init__(self, uri=None, generations=10):
self.retry_5xx = True
self.key_env_var = "REST_API_KEY"

if "rest" in dir(_config.plugins.generators):
if "rest.RestGenerator" in _config.plugins.generators:
for field in (
"name",
"uri",
Expand All @@ -124,21 +124,31 @@ def __init__(self, uri=None, generations=10):
"response_timeout",
"ratelimit_codes",
):
if field in _config.plugins.generators["rest"]:
setattr(self, field, _config.plugins.generator["rest"][field])
if field in _config.plugins.generators["rest.RestGenerator"]:
setattr(
self,
field,
_config.plugins.generators["rest.RestGenerator"][field],
)

if "req_template_json_object" in _config.plugins.generators["rest"]:
if (
"req_template_json_object"
in _config.plugins.generators["rest.RestGenerator"]
):
self.req_template = json.dumps(
_config.plugins.generators["rest"]["req_template_json_object"]
_config.plugins.generators["rest.RestGenerator"][
"req_template_json_object"
]
)

if (
self.response_json
and "response_json_field" in _config.plugins.generators["rest"]
and "response_json_field"
in _config.plugins.generators["rest.RestGenerator"]
):
self.response_json_field = _config.plugins.generators["rest"][
"response_json_field"
]
self.response_json_field = _config.plugins.generators[
"rest.RestGenerator"
]["response_json_field"]

if self.name is None:
self.name = self.uri
Expand Down
Loading