-
Notifications
You must be signed in to change notification settings - Fork 68
[PLT-46] Add method / heurisrtics to extract original sdk method name from python trace #1845
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 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 hidden or 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 |
---|---|---|
@@ -1,6 +1,8 @@ | ||
import inspect | ||
import json | ||
import logging | ||
import os | ||
import re | ||
import sys | ||
from datetime import datetime, timezone | ||
from types import MappingProxyType | ||
|
@@ -22,6 +24,39 @@ def python_version_info(): | |
return f"{version_info.major}.{version_info.minor}.{version_info.micro}-{version_info.releaselevel}" | ||
|
||
|
||
LABELBOX_CALL_PATTERN = re.compile(r"/labelbox/") | ||
|
||
|
||
def call_info(): | ||
method_name = "Unknown" | ||
prefix = "" | ||
class_name = "" | ||
skip_methods = ["wrapper", "__init__"] | ||
skip_classes = ["PaginatedCollection", "_CursorPagination", "_OffsetPagination"] | ||
|
||
try: | ||
call_info = None | ||
for stack in reversed(inspect.stack()): | ||
if LABELBOX_CALL_PATTERN.search(stack.filename): | ||
call_info = stack | ||
method_name = call_info.function | ||
class_name = call_info.frame.f_locals.get( | ||
"self", None | ||
).__class__.__name__ | ||
|
||
if method_name not in skip_methods and class_name not in skip_classes: | ||
if "test" in call_info.filename: | ||
prefix = "test:" | ||
else: | ||
if class_name == "NoneType": | ||
class_name = "" | ||
break | ||
|
||
except Exception: | ||
pass | ||
return (prefix, class_name, method_name) | ||
|
||
|
||
class RequestClient: | ||
"""A Labelbox request client. | ||
|
||
|
@@ -186,6 +221,9 @@ def convert_value(value): | |
if files: | ||
del headers["Content-Type"] | ||
del headers["Accept"] | ||
headers["X-SDK-Method"] = ( | ||
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. Kind of a nit: This is the only place we use call_info right? Can we just have it create the string directly? Or if you prefer it like this, at least replace the three calls with a single call? |
||
f"{call_info()[0]}{call_info()[1]}:{call_info()[2]}" | ||
) | ||
request = requests.Request( | ||
"POST", | ||
endpoint, | ||
|
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.
Can we test for a match against
.*_test.py
or something, so we don't accidentally catchlatest_whatever.py
(e.g.) hereThere 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.
good point ok