forked from open-telemetry/opentelemetry-python-contrib
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
VertexAI emit user, system, and assistant events (open-telemetry#3203)
* VertexAI emit user events * Emit system and assistant events * Fix for python 3.8 * Record events regardless of span recording * fix tests * Apply suggestions from code review Co-authored-by: Emídio Neto <9735060+emdneto@users.noreply.github.com> --------- Co-authored-by: Emídio Neto <9735060+emdneto@users.noreply.github.com>
- Loading branch information
1 parent
496738d
commit 4b6cf60
Showing
8 changed files
with
534 additions
and
11 deletions.
There are no files selected for viewing
This file contains 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
91 changes: 91 additions & 0 deletions
91
...entelemetry-instrumentation-vertexai/src/opentelemetry/instrumentation/vertexai/events.py
This file contains 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 |
---|---|---|
@@ -0,0 +1,91 @@ | ||
# Copyright The OpenTelemetry Authors | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
""" | ||
Factories for event types described in | ||
https://github.com/open-telemetry/semantic-conventions/blob/main/docs/gen-ai/gen-ai-events.md#system-event. | ||
Hopefully this code can be autogenerated by Weaver once Gen AI semantic conventions are | ||
schematized in YAML and the Weaver tool supports it. | ||
""" | ||
|
||
from opentelemetry._events import Event | ||
from opentelemetry.semconv._incubating.attributes import gen_ai_attributes | ||
from opentelemetry.util.types import AnyValue | ||
|
||
|
||
def user_event( | ||
*, | ||
role: str = "user", | ||
content: AnyValue = None, | ||
) -> Event: | ||
"""Creates a User event | ||
https://github.com/open-telemetry/semantic-conventions/blob/v1.28.0/docs/gen-ai/gen-ai-events.md#user-event | ||
""" | ||
body: dict[str, AnyValue] = { | ||
"role": role, | ||
} | ||
if content is not None: | ||
body["content"] = content | ||
return Event( | ||
name="gen_ai.user.message", | ||
attributes={ | ||
gen_ai_attributes.GEN_AI_SYSTEM: gen_ai_attributes.GenAiSystemValues.VERTEX_AI.value, | ||
}, | ||
body=body, | ||
) | ||
|
||
|
||
def assistant_event( | ||
*, | ||
role: str = "assistant", | ||
content: AnyValue = None, | ||
) -> Event: | ||
"""Creates an Assistant event | ||
https://github.com/open-telemetry/semantic-conventions/blob/v1.28.0/docs/gen-ai/gen-ai-events.md#assistant-event | ||
""" | ||
body: dict[str, AnyValue] = { | ||
"role": role, | ||
} | ||
if content is not None: | ||
body["content"] = content | ||
return Event( | ||
name="gen_ai.assistant.message", | ||
attributes={ | ||
gen_ai_attributes.GEN_AI_SYSTEM: gen_ai_attributes.GenAiSystemValues.VERTEX_AI.value, | ||
}, | ||
body=body, | ||
) | ||
|
||
|
||
def system_event( | ||
*, | ||
role: str = "system", | ||
content: AnyValue = None, | ||
) -> Event: | ||
"""Creates a System event | ||
https://github.com/open-telemetry/semantic-conventions/blob/v1.28.0/docs/gen-ai/gen-ai-events.md#system-event | ||
""" | ||
body: dict[str, AnyValue] = { | ||
"role": role, | ||
} | ||
if content is not None: | ||
body["content"] = content | ||
return Event( | ||
name="gen_ai.system.message", | ||
attributes={ | ||
gen_ai_attributes.GEN_AI_SYSTEM: gen_ai_attributes.GenAiSystemValues.VERTEX_AI.value, | ||
}, | ||
body=body, | ||
) |
This file contains 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 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
94 changes: 94 additions & 0 deletions
94
...etry-instrumentation-vertexai/tests/cassettes/test_generate_content_all_input_events.yaml
This file contains 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 |
---|---|---|
@@ -0,0 +1,94 @@ | ||
interactions: | ||
- request: | ||
body: |- | ||
{ | ||
"contents": [ | ||
{ | ||
"role": "user", | ||
"parts": [ | ||
{ | ||
"text": "My name is OpenTelemetry" | ||
} | ||
] | ||
}, | ||
{ | ||
"role": "model", | ||
"parts": [ | ||
{ | ||
"text": "Hello OpenTelemetry!" | ||
} | ||
] | ||
}, | ||
{ | ||
"role": "user", | ||
"parts": [ | ||
{ | ||
"text": "Address me by name and say this is a test" | ||
} | ||
] | ||
} | ||
], | ||
"systemInstruction": { | ||
"role": "user", | ||
"parts": [ | ||
{ | ||
"text": "You are a clever language model" | ||
} | ||
] | ||
} | ||
} | ||
headers: | ||
Accept: | ||
- '*/*' | ||
Accept-Encoding: | ||
- gzip, deflate | ||
Connection: | ||
- keep-alive | ||
Content-Length: | ||
- '548' | ||
Content-Type: | ||
- application/json | ||
User-Agent: | ||
- python-requests/2.32.3 | ||
method: POST | ||
uri: https://us-central1-aiplatform.googleapis.com/v1/projects/fake-project/locations/us-central1/publishers/google/models/gemini-1.5-flash-002:generateContent?%24alt=json%3Benum-encoding%3Dint | ||
response: | ||
body: | ||
string: |- | ||
{ | ||
"candidates": [ | ||
{ | ||
"content": { | ||
"role": "model", | ||
"parts": [ | ||
{ | ||
"text": "OpenTelemetry, this is a test.\n" | ||
} | ||
] | ||
}, | ||
"finishReason": 1, | ||
"avgLogprobs": -1.1655389850299496e-06 | ||
} | ||
], | ||
"usageMetadata": { | ||
"promptTokenCount": 25, | ||
"candidatesTokenCount": 9, | ||
"totalTokenCount": 34 | ||
}, | ||
"modelVersion": "gemini-1.5-flash-002" | ||
} | ||
headers: | ||
Content-Type: | ||
- application/json; charset=UTF-8 | ||
Transfer-Encoding: | ||
- chunked | ||
Vary: | ||
- Origin | ||
- X-Origin | ||
- Referer | ||
content-length: | ||
- '422' | ||
status: | ||
code: 200 | ||
message: OK | ||
version: 1 |
56 changes: 56 additions & 0 deletions
56
...elemetry-instrumentation-vertexai/tests/cassettes/test_generate_content_invalid_role.yaml
This file contains 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 |
---|---|---|
@@ -0,0 +1,56 @@ | ||
interactions: | ||
- request: | ||
body: |- | ||
{ | ||
"contents": [ | ||
{ | ||
"role": "invalid_role", | ||
"parts": [ | ||
{ | ||
"text": "Say this is a test" | ||
} | ||
] | ||
} | ||
] | ||
} | ||
headers: | ||
Accept: | ||
- '*/*' | ||
Accept-Encoding: | ||
- gzip, deflate | ||
Connection: | ||
- keep-alive | ||
Content-Length: | ||
- '149' | ||
Content-Type: | ||
- application/json | ||
User-Agent: | ||
- python-requests/2.32.3 | ||
method: POST | ||
uri: https://us-central1-aiplatform.googleapis.com/v1/projects/fake-project/locations/us-central1/publishers/google/models/gemini-1.5-flash-002:generateContent?%24alt=json%3Benum-encoding%3Dint | ||
response: | ||
body: | ||
string: |- | ||
{ | ||
"error": { | ||
"code": 400, | ||
"message": "Please use a valid role: user, model.", | ||
"status": "INVALID_ARGUMENT", | ||
"details": [] | ||
} | ||
} | ||
headers: | ||
Content-Type: | ||
- application/json; charset=UTF-8 | ||
Transfer-Encoding: | ||
- chunked | ||
Vary: | ||
- Origin | ||
- X-Origin | ||
- Referer | ||
content-length: | ||
- '416' | ||
status: | ||
code: 400 | ||
message: Bad Request | ||
version: 1 |
Oops, something went wrong.