@arizeai/phoenix-cli 0.2.0 → 0.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -4
- package/build/commands/spanAnnotations.d.ts +14 -0
- package/build/commands/spanAnnotations.d.ts.map +1 -0
- package/build/commands/spanAnnotations.js +60 -0
- package/build/commands/spanAnnotations.js.map +1 -0
- package/build/commands/trace.d.ts.map +1 -1
- package/build/commands/trace.js +29 -0
- package/build/commands/trace.js.map +1 -1
- package/build/commands/traces.d.ts.map +1 -1
- package/build/commands/traces.js +37 -0
- package/build/commands/traces.js.map +1 -1
- package/build/trace.d.ts +9 -5
- package/build/trace.d.ts.map +1 -1
- package/build/trace.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -96,6 +96,7 @@ px traces --format raw --no-progress | jq # Pipe to jq
|
|
|
96
96
|
| `--since <timestamp>` | Fetch traces since ISO timestamp | — |
|
|
97
97
|
| `--format <format>` | `pretty`, `json`, or `raw` | `pretty` |
|
|
98
98
|
| `--no-progress` | Disable progress output | — |
|
|
99
|
+
| `--include-annotations` | Include span annotations in trace export | — |
|
|
99
100
|
|
|
100
101
|
### `px trace <trace-id>`
|
|
101
102
|
|
|
@@ -107,10 +108,11 @@ px trace abc123def456 --file trace.json # Save to file
|
|
|
107
108
|
px trace abc123def456 --format raw | jq # Pipe to jq
|
|
108
109
|
```
|
|
109
110
|
|
|
110
|
-
| Option
|
|
111
|
-
|
|
|
112
|
-
| `--file <path>`
|
|
113
|
-
| `--format <format>`
|
|
111
|
+
| Option | Description | Default |
|
|
112
|
+
| ----------------------- | ---------------------------------------- | -------- |
|
|
113
|
+
| `--file <path>` | Save to file instead of stdout | stdout |
|
|
114
|
+
| `--format <format>` | `pretty`, `json`, or `raw` | `pretty` |
|
|
115
|
+
| `--include-annotations` | Include span annotations in trace export | — |
|
|
114
116
|
|
|
115
117
|
### `px datasets`
|
|
116
118
|
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { componentsV1, PhoenixClient } from "@arizeai/phoenix-client";
|
|
2
|
+
export type SpanAnnotation = componentsV1["schemas"]["SpanAnnotation"];
|
|
3
|
+
interface FetchSpanAnnotationsOptions {
|
|
4
|
+
client: PhoenixClient;
|
|
5
|
+
projectIdentifier: string;
|
|
6
|
+
spanIds: string[];
|
|
7
|
+
includeAnnotationNames?: string[];
|
|
8
|
+
excludeAnnotationNames?: string[];
|
|
9
|
+
pageLimit?: number;
|
|
10
|
+
maxConcurrent?: number;
|
|
11
|
+
}
|
|
12
|
+
export declare function fetchSpanAnnotations({ client, projectIdentifier, spanIds, includeAnnotationNames, excludeAnnotationNames, pageLimit, maxConcurrent, }: FetchSpanAnnotationsOptions): Promise<SpanAnnotation[]>;
|
|
13
|
+
export {};
|
|
14
|
+
//# sourceMappingURL=spanAnnotations.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"spanAnnotations.d.ts","sourceRoot":"","sources":["../../src/commands/spanAnnotations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE3E,MAAM,MAAM,cAAc,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,gBAAgB,CAAC,CAAC;AAMvE,UAAU,2BAA2B;IACnC,MAAM,EAAE,aAAa,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AA4DD,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,iBAAiB,EACjB,OAAO,EACP,sBAAsB,EACtB,sBAAsB,EACtB,SAA8B,EAC9B,aAAsC,GACvC,EAAE,2BAA2B,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CA8BzD"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
const DEFAULT_PAGE_LIMIT = 1000;
|
|
2
|
+
const DEFAULT_SPAN_IDS_CHUNK_SIZE = 100;
|
|
3
|
+
const DEFAULT_MAX_CONCURRENT = 5;
|
|
4
|
+
function chunkArray(items, size) {
|
|
5
|
+
const chunks = [];
|
|
6
|
+
for (let i = 0; i < items.length; i += size) {
|
|
7
|
+
chunks.push(items.slice(i, i + size));
|
|
8
|
+
}
|
|
9
|
+
return chunks;
|
|
10
|
+
}
|
|
11
|
+
async function fetchSpanAnnotationsForChunk({ client, projectIdentifier, spanIds, includeAnnotationNames, excludeAnnotationNames, pageLimit, }) {
|
|
12
|
+
const annotations = [];
|
|
13
|
+
let cursor;
|
|
14
|
+
do {
|
|
15
|
+
const response = await client.GET("/v1/projects/{project_identifier}/span_annotations", {
|
|
16
|
+
params: {
|
|
17
|
+
path: {
|
|
18
|
+
project_identifier: projectIdentifier,
|
|
19
|
+
},
|
|
20
|
+
query: {
|
|
21
|
+
span_ids: spanIds,
|
|
22
|
+
cursor,
|
|
23
|
+
limit: pageLimit,
|
|
24
|
+
include_annotation_names: includeAnnotationNames,
|
|
25
|
+
exclude_annotation_names: excludeAnnotationNames,
|
|
26
|
+
},
|
|
27
|
+
},
|
|
28
|
+
});
|
|
29
|
+
if (response.error || !response.data) {
|
|
30
|
+
throw new Error(`Failed to fetch span annotations: ${String(response.error)}`);
|
|
31
|
+
}
|
|
32
|
+
annotations.push(...response.data.data);
|
|
33
|
+
cursor = response.data.next_cursor || undefined;
|
|
34
|
+
} while (cursor);
|
|
35
|
+
return annotations;
|
|
36
|
+
}
|
|
37
|
+
export async function fetchSpanAnnotations({ client, projectIdentifier, spanIds, includeAnnotationNames, excludeAnnotationNames, pageLimit = DEFAULT_PAGE_LIMIT, maxConcurrent = DEFAULT_MAX_CONCURRENT, }) {
|
|
38
|
+
if (spanIds.length === 0) {
|
|
39
|
+
return [];
|
|
40
|
+
}
|
|
41
|
+
const uniqueSpanIds = Array.from(new Set(spanIds));
|
|
42
|
+
const chunks = chunkArray(uniqueSpanIds, DEFAULT_SPAN_IDS_CHUNK_SIZE);
|
|
43
|
+
const allAnnotations = [];
|
|
44
|
+
for (let i = 0; i < chunks.length; i += maxConcurrent) {
|
|
45
|
+
const batch = chunks.slice(i, i + maxConcurrent);
|
|
46
|
+
const batchResults = await Promise.all(batch.map((spanIdsChunk) => fetchSpanAnnotationsForChunk({
|
|
47
|
+
client,
|
|
48
|
+
projectIdentifier,
|
|
49
|
+
spanIds: spanIdsChunk,
|
|
50
|
+
includeAnnotationNames,
|
|
51
|
+
excludeAnnotationNames,
|
|
52
|
+
pageLimit,
|
|
53
|
+
})));
|
|
54
|
+
for (const result of batchResults) {
|
|
55
|
+
allAnnotations.push(...result);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
return allAnnotations;
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=spanAnnotations.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"spanAnnotations.js","sourceRoot":"","sources":["../../src/commands/spanAnnotations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../src/commands/trace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../src/commands/trace.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwMpC;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAuB5C"}
|
package/build/commands/trace.js
CHANGED
|
@@ -3,6 +3,7 @@ import { getConfigErrorMessage, resolveConfig, validateConfig, } from "../config
|
|
|
3
3
|
import { writeError, writeOutput, writeProgress } from "../io.js";
|
|
4
4
|
import { buildTrace } from "../trace.js";
|
|
5
5
|
import { formatTraceOutput } from "./formatTraces.js";
|
|
6
|
+
import { fetchSpanAnnotations } from "./spanAnnotations.js";
|
|
6
7
|
import { Command } from "commander";
|
|
7
8
|
import * as fs from "fs";
|
|
8
9
|
/**
|
|
@@ -93,6 +94,33 @@ async function traceHandler(traceId, options) {
|
|
|
93
94
|
message: `Found ${spans.length} span(s)`,
|
|
94
95
|
noProgress: !options.progress,
|
|
95
96
|
});
|
|
97
|
+
if (options.includeAnnotations) {
|
|
98
|
+
const spanIds = spans
|
|
99
|
+
.map((span) => span.context?.span_id)
|
|
100
|
+
.filter((spanId) => Boolean(spanId));
|
|
101
|
+
const annotations = await fetchSpanAnnotations({
|
|
102
|
+
client,
|
|
103
|
+
projectIdentifier: projectId,
|
|
104
|
+
spanIds,
|
|
105
|
+
});
|
|
106
|
+
const annotationsBySpanId = new Map();
|
|
107
|
+
for (const annotation of annotations) {
|
|
108
|
+
const spanId = annotation.span_id;
|
|
109
|
+
if (!annotationsBySpanId.has(spanId)) {
|
|
110
|
+
annotationsBySpanId.set(spanId, []);
|
|
111
|
+
}
|
|
112
|
+
annotationsBySpanId.get(spanId).push(annotation);
|
|
113
|
+
}
|
|
114
|
+
for (const span of spans) {
|
|
115
|
+
const spanId = span.context?.span_id;
|
|
116
|
+
if (!spanId)
|
|
117
|
+
continue;
|
|
118
|
+
const spanAnnotations = annotationsBySpanId.get(spanId);
|
|
119
|
+
if (spanAnnotations) {
|
|
120
|
+
span.annotations = spanAnnotations;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
96
124
|
// Build trace
|
|
97
125
|
const trace = buildTrace({ spans });
|
|
98
126
|
// Output trace
|
|
@@ -137,6 +165,7 @@ export function createTraceCommand() {
|
|
|
137
165
|
.option("--format <format>", "Output format: pretty, json, or raw", "pretty")
|
|
138
166
|
.option("--no-progress", "Disable progress indicators")
|
|
139
167
|
.option("--file <path>", "Save trace to file instead of stdout")
|
|
168
|
+
.option("--include-annotations", "Include span annotations in the trace export")
|
|
140
169
|
.action(traceHandler);
|
|
141
170
|
return command;
|
|
142
171
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/commands/trace.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EACL,qBAAqB,EACrB,aAAa,EACb,cAAc,GACf,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAqB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/commands/trace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"traces.d.ts","sourceRoot":"","sources":["../../src/commands/traces.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"traces.d.ts","sourceRoot":"","sources":["../../src/commands/traces.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2UpC;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAwC7C"}
|
package/build/commands/traces.js
CHANGED
|
@@ -3,6 +3,7 @@ import { getConfigErrorMessage, resolveConfig, validateConfig, } from "../config
|
|
|
3
3
|
import { writeError, writeOutput, writeProgress } from "../io.js";
|
|
4
4
|
import { buildTrace, groupSpansByTrace } from "../trace.js";
|
|
5
5
|
import { formatTracesOutput } from "./formatTraces.js";
|
|
6
|
+
import { fetchSpanAnnotations } from "./spanAnnotations.js";
|
|
6
7
|
import { Command } from "commander";
|
|
7
8
|
import * as fs from "fs";
|
|
8
9
|
import * as path from "path";
|
|
@@ -182,6 +183,41 @@ async function tracesHandler(directory, options) {
|
|
|
182
183
|
message: `Found ${traces.length} trace(s)`,
|
|
183
184
|
noProgress: !options.progress,
|
|
184
185
|
});
|
|
186
|
+
if (options.includeAnnotations) {
|
|
187
|
+
writeProgress({
|
|
188
|
+
message: "Fetching span annotations...",
|
|
189
|
+
noProgress: !options.progress,
|
|
190
|
+
});
|
|
191
|
+
const spanIds = traces
|
|
192
|
+
.flatMap((trace) => trace.spans)
|
|
193
|
+
.map((span) => span.context?.span_id)
|
|
194
|
+
.filter((spanId) => Boolean(spanId));
|
|
195
|
+
const annotations = await fetchSpanAnnotations({
|
|
196
|
+
client,
|
|
197
|
+
projectIdentifier: projectId,
|
|
198
|
+
spanIds,
|
|
199
|
+
maxConcurrent: options.maxConcurrent,
|
|
200
|
+
});
|
|
201
|
+
const annotationsBySpanId = new Map();
|
|
202
|
+
for (const annotation of annotations) {
|
|
203
|
+
const spanId = annotation.span_id;
|
|
204
|
+
if (!annotationsBySpanId.has(spanId)) {
|
|
205
|
+
annotationsBySpanId.set(spanId, []);
|
|
206
|
+
}
|
|
207
|
+
annotationsBySpanId.get(spanId).push(annotation);
|
|
208
|
+
}
|
|
209
|
+
for (const trace of traces) {
|
|
210
|
+
for (const span of trace.spans) {
|
|
211
|
+
const spanId = span.context?.span_id;
|
|
212
|
+
if (!spanId)
|
|
213
|
+
continue;
|
|
214
|
+
const spanAnnotations = annotationsBySpanId.get(spanId);
|
|
215
|
+
if (spanAnnotations) {
|
|
216
|
+
span.annotations = spanAnnotations;
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
}
|
|
185
221
|
// Output traces
|
|
186
222
|
if (directory) {
|
|
187
223
|
if (userSpecifiedFormat && options.format && options.format !== "json") {
|
|
@@ -233,6 +269,7 @@ export function createTracesCommand() {
|
|
|
233
269
|
.option("--last-n-minutes <number>", "Only fetch traces from the last N minutes", parseInt)
|
|
234
270
|
.option("--since <timestamp>", "Fetch traces since this ISO timestamp")
|
|
235
271
|
.option("--max-concurrent <number>", "Maximum concurrent fetches for bulk operations", parseInt, 10)
|
|
272
|
+
.option("--include-annotations", "Include span annotations in the trace export")
|
|
236
273
|
.action(tracesHandler);
|
|
237
274
|
return command;
|
|
238
275
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"traces.js","sourceRoot":"","sources":["../../src/commands/traces.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EACL,qBAAqB,EACrB,aAAa,EACb,cAAc,GACf,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAc,MAAM,UAAU,CAAC;AAErE,OAAO,EAAE,kBAAkB,EAAqB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"traces.js","sourceRoot":"","sources":["../../src/commands/traces.ts"],"names":[],"mappings":"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"}
|
package/build/trace.d.ts
CHANGED
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
import type { componentsV1 } from "@arizeai/phoenix-client";
|
|
2
2
|
export type Span = componentsV1["schemas"]["Span"];
|
|
3
|
+
export type SpanAnnotation = componentsV1["schemas"]["SpanAnnotation"];
|
|
4
|
+
export type SpanWithAnnotations = Span & {
|
|
5
|
+
annotations?: SpanAnnotation[];
|
|
6
|
+
};
|
|
3
7
|
/**
|
|
4
8
|
* Represents a trace with its spans organized hierarchically
|
|
5
9
|
*/
|
|
6
10
|
export interface Trace {
|
|
7
11
|
traceId: string;
|
|
8
|
-
spans:
|
|
9
|
-
rootSpan?:
|
|
12
|
+
spans: SpanWithAnnotations[];
|
|
13
|
+
rootSpan?: SpanWithAnnotations;
|
|
10
14
|
startTime?: string;
|
|
11
15
|
endTime?: string;
|
|
12
16
|
duration?: number;
|
|
@@ -19,12 +23,12 @@ export interface GroupSpansByTraceOptions {
|
|
|
19
23
|
/**
|
|
20
24
|
* Spans to group.
|
|
21
25
|
*/
|
|
22
|
-
spans:
|
|
26
|
+
spans: SpanWithAnnotations[];
|
|
23
27
|
}
|
|
24
28
|
/**
|
|
25
29
|
* Group spans by trace ID.
|
|
26
30
|
*/
|
|
27
|
-
export declare function groupSpansByTrace({ spans, }: GroupSpansByTraceOptions): Map<string,
|
|
31
|
+
export declare function groupSpansByTrace({ spans, }: GroupSpansByTraceOptions): Map<string, SpanWithAnnotations[]>;
|
|
28
32
|
/**
|
|
29
33
|
* Build a trace object from spans
|
|
30
34
|
*/
|
|
@@ -32,7 +36,7 @@ export interface BuildTraceOptions {
|
|
|
32
36
|
/**
|
|
33
37
|
* Spans belonging to a single trace.
|
|
34
38
|
*/
|
|
35
|
-
spans:
|
|
39
|
+
spans: SpanWithAnnotations[];
|
|
36
40
|
}
|
|
37
41
|
/**
|
|
38
42
|
* Build a trace object from spans.
|
package/build/trace.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../src/trace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,MAAM,MAAM,IAAI,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../src/trace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,MAAM,MAAM,IAAI,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;AACnD,MAAM,MAAM,cAAc,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,gBAAgB,CAAC,CAAC;AACvE,MAAM,MAAM,mBAAmB,GAAG,IAAI,GAAG;IAAE,WAAW,CAAC,EAAE,cAAc,EAAE,CAAA;CAAE,CAAC;AAE5E;;GAEG;AACH,MAAM,WAAW,KAAK;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,mBAAmB,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,KAAK,EAAE,mBAAmB,EAAE,CAAC;CAC9B;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,KAAK,GACN,EAAE,wBAAwB,GAAG,GAAG,CAAC,MAAM,EAAE,mBAAmB,EAAE,CAAC,CAY/D;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,KAAK,EAAE,mBAAmB,EAAE,CAAC;CAC9B;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,iBAAiB,GAAG,KAAK,CAiD9D"}
|
package/build/trace.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../src/trace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../src/trace.ts"],"names":[],"mappings":"AA6BA;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,EAChC,KAAK,GACoB;IACzB,MAAM,MAAM,GAAG,IAAI,GAAG,EAAiC,CAAC;IAExD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;QACtC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC1B,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAYD;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,EAAE,KAAK,EAAqB;IACrD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC,OAAO,CAAC,QAAQ,CAAC;IAE3C,6BAA6B;IAC7B,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAEjD,yBAAyB;IACzB,MAAM,UAAU,GAAG,KAAK;SACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC;SAC5C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5B,MAAM,QAAQ,GAAG,KAAK;SACnB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;SAC1C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5B,MAAM,SAAS,GACb,UAAU,CAAC,MAAM,GAAG,CAAC;QACnB,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,WAAW,EAAE;QACjD,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,OAAO,GACX,QAAQ,CAAC,MAAM,GAAG,CAAC;QACjB,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,WAAW,EAAE;QAC/C,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,QAAQ,GACZ,SAAS,IAAI,OAAO;QAClB,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE;QAC7D,CAAC,CAAC,SAAS,CAAC;IAEhB,mBAAmB;IACnB,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAC1B,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,WAAW,KAAK,OAAO;QACxB,CAAC,CAAC,UAA8C,EAAE,KAAK,CAC3D,CAAC;IACF,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAE1C,OAAO;QACL,OAAO;QACP,KAAK;QACL,QAAQ;QACR,SAAS;QACT,OAAO;QACP,QAAQ;QACR,MAAM;KACP,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@arizeai/phoenix-cli",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.1",
|
|
4
4
|
"description": "A command-line interface for Phoenix",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "build/index.js",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@arizeai/openinference-semantic-conventions": "^1.1.0",
|
|
34
34
|
"commander": "^12.1.0",
|
|
35
|
-
"@arizeai/phoenix-client": "5.
|
|
35
|
+
"@arizeai/phoenix-client": "5.7.0",
|
|
36
36
|
"@arizeai/phoenix-config": "0.1.0"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|