Skip to content

Commit d6b0135

Browse files
authored
fix: allow wrapt v2 (<3 upper bound) (#12714)
Relax wrapt from <2 to <3 and refresh uv.lock.
1 parent f2523dd commit d6b0135

5 files changed

Lines changed: 149 additions & 151 deletions

File tree

app/schema.graphql

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ input ChatCompletionOverDatasetInput {
396396
splitIds: [ID!] = null
397397
experimentName: String = null
398398
experimentDescription: String = null
399-
experimentMetadata: JSON = { }
399+
experimentMetadata: JSON = {}
400400
promptName: Identifier = null
401401
evaluators: [PlaygroundEvaluatorInput!]! = []
402402

@@ -445,7 +445,7 @@ input ChatPromptVersionInput {
445445
description: String = null
446446
templateFormat: PromptTemplateFormat!
447447
template: PromptChatTemplateInput!
448-
invocationParameters: JSON! = { }
448+
invocationParameters: JSON! = {}
449449
tools: PromptToolsInput = null
450450
responseFormat: PromptResponseFormatJSONSchemaInput = null
451451
modelProvider: GenerativeProviderKey!
@@ -627,7 +627,7 @@ input CreateDocumentAnnotationInput {
627627
label: String = null
628628
score: Float = null
629629
explanation: String = null
630-
metadata: JSON! = { }
630+
metadata: JSON! = {}
631631
source: AnnotationSource!
632632
identifier: String
633633
}
@@ -671,7 +671,7 @@ input CreateProjectSessionAnnotationInput {
671671
label: String = null
672672
score: Float = null
673673
explanation: String = null
674-
metadata: JSON! = { }
674+
metadata: JSON! = {}
675675
source: AnnotationSource! = APP
676676
identifier: String
677677
}
@@ -701,7 +701,7 @@ input CreateSpanAnnotationInput {
701701
label: String = null
702702
score: Float = null
703703
explanation: String = null
704-
metadata: JSON! = { }
704+
metadata: JSON! = {}
705705
source: AnnotationSource!
706706
identifier: String
707707
}
@@ -724,7 +724,7 @@ input CreateTraceAnnotationInput {
724724
label: String = null
725725
score: Float = null
726726
explanation: String = null
727-
metadata: JSON! = { }
727+
metadata: JSON! = {}
728728
source: AnnotationSource!
729729
identifier: String
730730
}
@@ -1366,8 +1366,8 @@ type EvaluatorInputMapping {
13661366
}
13671367

13681368
input EvaluatorInputMappingInput {
1369-
literalMapping: JSON! = { }
1370-
pathMapping: JSON! = { }
1369+
literalMapping: JSON! = {}
1370+
pathMapping: JSON! = {}
13711371
}
13721372

13731373
enum EvaluatorKind {
@@ -1384,7 +1384,7 @@ input EvaluatorPreviewInput @oneOf {
13841384
input EvaluatorPreviewItemInput {
13851385
evaluator: EvaluatorPreviewInput!
13861386
context: JSON!
1387-
inputMapping: EvaluatorInputMappingInput! = { }
1387+
inputMapping: EvaluatorInputMappingInput! = {}
13881388
}
13891389

13901390
input EvaluatorPreviewsInput {
@@ -2344,7 +2344,7 @@ input PlaygroundEvaluatorInput {
23442344
id: ID!
23452345
name: Identifier!
23462346
description: String = null
2347-
inputMapping: EvaluatorInputMappingInput! = { }
2347+
inputMapping: EvaluatorInputMappingInput! = {}
23482348
outputConfigs: [AnnotationConfigInput!] = null
23492349
}
23502350

@@ -3742,7 +3742,7 @@ input UpdateAnnotationInput {
37423742
label: String = null
37433743
score: Float = null
37443744
explanation: String = null
3745-
metadata: JSON! = { }
3745+
metadata: JSON! = {}
37463746
source: AnnotationSource! = APP
37473747
}
37483748

examples/computer_use_agent/instrumentor.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ def _instrument(self, **kwargs: Any) -> None:
1313

1414
self._original_beta_messages_create = Messages.create
1515
wrap_function_wrapper(
16-
module="anthropic.resources.beta.messages",
17-
name="Messages.create",
18-
wrapper=_MessagesWrapper(tracer=self._tracer),
16+
"anthropic.resources.beta.messages",
17+
"Messages.create",
18+
_MessagesWrapper(tracer=self._tracer),
1919
)
2020

2121
def _uninstrument(self, **kwargs: Any) -> None:

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies = [
3737
"pyarrow",
3838
"typing-extensions>=4.6",
3939
"scipy",
40-
"wrapt>=1.17.2,<2",
40+
"wrapt>=1.17.2,<3",
4141
"grpcio",
4242
"grpc-interceptor",
4343
"tqdm",

src/phoenix/trace/projects.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ def __init__(self, project_name: str) -> None:
5757
def __enter__(self) -> None:
5858
self.unwrapped_init: Optional[Callable[..., None]] = trace.ReadableSpan.__init__
5959
wrap_function_wrapper(
60-
module="opentelemetry.sdk.trace",
61-
name="ReadableSpan.__init__",
62-
wrapper=project_override_wrapper(self.project_name),
60+
"opentelemetry.sdk.trace",
61+
"ReadableSpan.__init__",
62+
project_override_wrapper(self.project_name),
6363
)
6464

6565
def __exit__(

0 commit comments

Comments
 (0)