-
Notifications
You must be signed in to change notification settings - Fork 28
feat: add X-Dataverse-Skills tracking header to all execution surfaces #36
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
Open
arorashivam96
wants to merge
1
commit into
main
Choose a base branch
from
u/shivamarora/dv-plugin-telemetry
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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
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
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
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 |
|---|---|---|
|
|
@@ -13,19 +13,19 @@ | |
| without re-prompting the user. | ||
|
|
||
| Functions: | ||
| load_env() — loads .env into os.environ | ||
| get_credential() — returns a TokenCredential for use with DataverseClient | ||
| get_token(scope=None) — returns a raw access token string | ||
| load_env() — loads .env into os.environ | ||
| get_credential() — returns a TokenCredential for use with DataverseClient | ||
| get_token(scope=None) — returns a raw access token string | ||
| tracking_headers(surface) — returns X-Dataverse-Skills header dict | ||
| create_client() — returns a DataverseClient with tracking headers injected | ||
|
|
||
| Usage: | ||
| # PREFERRED — use the Python SDK for all supported operations: | ||
| from auth import get_credential, load_env | ||
| from PowerPlatform.Dataverse.client import DataverseClient | ||
| load_env() | ||
| client = DataverseClient(os.environ["DATAVERSE_URL"], get_credential()) | ||
| # PREFERRED — use create_client() for all SDK operations: | ||
| from auth import create_client | ||
| client = create_client() | ||
|
|
||
| # ONLY for operations the SDK does NOT support (forms, views, $ref, $apply): | ||
| from auth import get_token, load_env | ||
| from auth import get_token, load_env, tracking_headers | ||
| token = get_token() | ||
|
|
||
| Reads from .env in the repo root (parent of scripts/) or current working directory: | ||
|
|
@@ -39,6 +39,8 @@ | |
| import sys | ||
| from pathlib import Path | ||
|
|
||
| PLUGIN_VERSION = "1.2.0" | ||
|
|
||
| # AuthenticationRecord is persisted here so new processes skip device code flow | ||
| _AUTH_RECORD_PATH = Path(os.environ.get("LOCALAPPDATA") or Path.home()) / ".IdentityService" / "dataverse_cli_auth_record.json" | ||
|
|
||
|
|
@@ -188,6 +190,30 @@ def get_token(scope=None): | |
| return token.token | ||
|
|
||
|
|
||
| def tracking_headers(surface): | ||
| """Return the X-Dataverse-Skills header dict for the given execution surface.""" | ||
| return {"X-Dataverse-Skills": f"surface={surface}; version={PLUGIN_VERSION}"} | ||
|
|
||
|
|
||
| def create_client(): | ||
| """Create a DataverseClient with tracking headers auto-injected on every request. | ||
|
|
||
| Patches the internal _headers() method on the OData client so the | ||
| X-Dataverse-Skills header is included in every SDK HTTP call. | ||
| """ | ||
| load_env() | ||
| from PowerPlatform.Dataverse.client import DataverseClient | ||
| client = DataverseClient(os.environ["DATAVERSE_URL"], get_credential()) | ||
| odata = client._get_odata() | ||
| _orig = odata._headers | ||
| def _with_tracking(): | ||
| h = _orig() | ||
| h.update(tracking_headers("python-sdk")) | ||
|
Collaborator
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. Do we know which skill was loaded? |
||
| return h | ||
| odata._headers = _with_tracking | ||
| return client | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| token = get_token() | ||
| print(token) | ||
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
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
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
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
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
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
Oops, something went wrong.
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.
This can't be hardcoded string right?