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

ENG-834 Add fetching autofeedback by completion id to cli #175

Merged
merged 4 commits into from
Jun 4, 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
15 changes: 15 additions & 0 deletions cli_docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ And to download to a JSONL file, use `log10 feedback download --task_id 04405cbc

To leverage your feedback and use AI to generate more feedback automatically, use [`log10 feedback predict`](#log10-feedback-predict). Please refer to this [doc](https://log10.io/docs/feedback/auto_feedback) for more details.

To get auto generated feedback for a completion, use [`log10 feedback autofeedback get`](#log10-feedback-autofeedback-get)

## CLI References

### Completions
Expand Down Expand Up @@ -399,6 +401,8 @@ Options:
$ log10 feedback predict --help
Usage: log10 feedback predict [OPTIONS]

Generate feedback with existing human feedback based on in context learning

Options:
--task_id TEXT Feedback task ID
--content TEXT Completion content
Expand All @@ -407,6 +411,17 @@ Options:
--num_samples INTEGER Number of samples to use for few-shot learning
```
#### log10 feedback autofeedback get
```bash
$ log10 feedback autofeedback get --help
Usage: log10 feedback autofeedback get [OPTIONS]

Get an auto feedback by completion id

Options:
--completion-id TEXT Completion ID [required]
```
### Feedback Task
```bash
Expand Down
15 changes: 13 additions & 2 deletions log10/__main__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import click

from log10.completions.completions import benchmark_models, download_completions, get_completion, list_completions
from log10.feedback.autofeedback import auto_feedback_icl
from log10.feedback.autofeedback import auto_feedback_icl, get_autofeedback_cli
from log10.feedback.feedback import create_feedback, download_feedback, get_feedback, list_feedback
from log10.feedback.feedback_task import create_feedback_task, get_feedback_task, list_feedback_task

Expand All @@ -19,14 +19,22 @@ def completions():
pass


@click.group()
@click.group(name="feedback")
def feedback():
"""
Manage feedback for completions i.e. capturing feedback from users
"""
pass


@click.group(name="auto_feedback")
def auto_feedback():
"""
Manage auto feedback for completions i.e. capturing feedback from users
"""
pass


@click.group()
def feedback_task():
"""
Expand All @@ -47,6 +55,9 @@ def feedback_task():
feedback.add_command(get_feedback, "get")
feedback.add_command(download_feedback, "download")
feedback.add_command(auto_feedback_icl, "predict")
feedback.add_command(auto_feedback, "autofeedback")
# Subcommands for auto_feedback under feedback command
auto_feedback.add_command(get_autofeedback_cli, "get")

cli.add_command(feedback_task)
feedback_task.add_command(create_feedback_task, "create")
Expand Down
43 changes: 43 additions & 0 deletions log10/_httpx_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

logger: logging.Logger = logging.getLogger("LOG10")

GRAPHQL_URL = "https://graphql.log10.io/graphql"

_log10_config = Log10Config()
base_url = _log10_config.url
Expand Down Expand Up @@ -85,6 +86,48 @@ def _try_post_request(url: str, payload: dict = {}) -> httpx.Response:
logger.error(f"Failed to insert in log10: {payload} with error {err}")


def _try_post_graphql_request(query: str, variables: dict = {}) -> httpx.Response:
kxtran marked this conversation as resolved.
Show resolved Hide resolved
headers = {"content-type": "application/json", "x-api-token": _log10_config.token}

payload = {"query": query, "variables": variables}
res = None
try:
res = httpx_client.post(GRAPHQL_URL, headers=headers, json=payload)
res.raise_for_status()
return res
except httpx.HTTPError as http_err:
if "401" in str(http_err):
logger.error(
"Failed anthorization. Please verify that LOG10_TOKEN and LOG10_ORG_ID are set correctly and try again."
+ "\nSee https://github.com/log10-io/log10#%EF%B8%8F-setup for details"
)
else:
logger.error(f"Failed with error: {http_err}")
except Exception as err:
logger.error(f"Failed to make requests to log10 graphQL: {payload} with error {err}")


async def _try_post_graphql_request_async(query: str, variables: dict = {}) -> httpx.Response:
headers = {"content-type": "application/json", "x-api-token": _log10_config.token}

payload = {"query": query, "variables": variables}
res = None
try:
res = await httpx_async_client.post(GRAPHQL_URL, headers=headers, json=payload)
res.raise_for_status()
return res
except httpx.HTTPError as http_err:
if "401" in str(http_err):
logger.error(
"Failed anthorization. Please verify that LOG10_TOKEN and LOG10_ORG_ID are set correctly and try again."
+ "\nSee https://github.com/log10-io/log10#%EF%B8%8F-setup for details"
)
else:
logger.error(f"Failed with error: {http_err}")
except Exception as err:
logger.error(f"Failed to make requests to log10 graphQL: {payload} with error {err}")


async def _try_post_request_async(url: str, payload: dict = {}) -> httpx.Response:
headers = {
"x-log10-token": _log10_config.token,
Expand Down
51 changes: 51 additions & 0 deletions log10/feedback/autofeedback.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@
from types import FunctionType

import click
import httpx
import rich
from rich.console import Console

from log10._httpx_utils import _try_post_graphql_request
from log10.completions.completions import _get_completion
from log10.feedback.feedback import _get_feedback_list
from log10.llm import Log10Config
from log10.load import log10_session


Expand All @@ -22,6 +26,8 @@
logger = logging.getLogger("LOG10")
logger.setLevel(logging.INFO)

_log10_config = Log10Config()


class AutoFeedbackICL:
"""
Expand Down Expand Up @@ -95,13 +101,47 @@ def predict(self, text: str = None, completion_id: str = None) -> str:
return ret


def get_autofeedback(completion_id: str) -> httpx.Response:
query = """
query OrganizationCompletion($orgId: String!, $id: String!) {
organization(id: $orgId) {
completion(id: $id) {
id
autoFeedback {
id
status
jsonValues
comment
}
}
}
}
"""

variables = {"orgId": _log10_config.org_id, "id": completion_id}

response = _try_post_graphql_request(query, variables)

if response is None:
logger.error(f"Failed to get auto feedback for completion {completion_id}")
return None

if response.status_code == 200:
return response.json()
else:
response.raise_for_status()


@click.command()
@click.option("--task_id", help="Feedback task ID")
@click.option("--content", help="Completion content")
@click.option("--file", "-f", help="File containing completion content")
@click.option("--completion_id", help="Completion ID")
@click.option("--num_samples", default=5, help="Number of samples to use for few-shot learning")
def auto_feedback_icl(task_id: str, content: str, file: str, completion_id: str, num_samples: int):
"""
Generate feedback with existing human feedback based on in context learning
"""
options_count = sum([1 for option in [content, file, completion_id] if option])
if options_count > 1:
click.echo("Only one of --content, --file, or --completion_id should be provided.")
Expand All @@ -119,3 +159,14 @@ def auto_feedback_icl(task_id: str, content: str, file: str, completion_id: str,
content = f.read()
results = auto_feedback_icl.predict(text=content)
console.print_json(results)


@click.command()
@click.option("--completion-id", required=True, help="Completion ID")
def get_autofeedback_cli(completion_id: str):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about name it get_autofeedback? not sure we want the cli in the function name.

Copy link
Collaborator Author

@kxtran kxtran Jun 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have the sdk called get_autofeedback so I was trying to differentiate between this one and sdk since they both have the same argument as well. I'm open for any naming suggestion that could be either this one or the actual cli func

"""
Get an auto feedback by completion id
"""
res = get_autofeedback(completion_id)
if res:
rich.print_json(json.dumps(res["data"], indent=4))
2 changes: 1 addition & 1 deletion log10/feedback/feedback.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def list_feedback(offset, limit, task_id):


@click.command()
@click.option("--id", help="Get feedback by ID")
@click.option("--id", required=True, help="Get feedback by ID")
def get_feedback(id):
"""
Get feedback based on provided ID.
Expand Down
Loading