@vscode/chat-lib 0.4.1-4 → 0.4.1-6
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/dist/src/_internal/extension/completions-core/vscode-node/lib/src/ghostText/completionsFromNetwork.js +1 -1
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/ghostText/completionsFromNetwork.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/common/editRebase.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/common/editRebase.js +2 -35
- package/dist/src/_internal/extension/inlineEdits/common/editRebase.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/common/userInteractionMonitor.js +2 -35
- package/dist/src/_internal/extension/inlineEdits/common/userInteractionMonitor.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.d.ts +9 -0
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.js +64 -58
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProviderTelemetry.d.ts +7 -0
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProviderTelemetry.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProviderTelemetry.js +8 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProviderTelemetry.js.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.d.ts +3 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.d.ts.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.js +29 -48
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.js.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.js +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.js.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabNextCursorPredictor.js +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabNextCursorPredictor.js.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.js +8 -8
- package/dist/src/_internal/extension/xtab/node/xtabProvider.js.map +1 -1
- package/dist/src/_internal/platform/configuration/common/configurationService.d.ts +10 -6
- package/dist/src/_internal/platform/configuration/common/configurationService.d.ts.map +1 -1
- package/dist/src/_internal/platform/configuration/common/configurationService.js +12 -8
- package/dist/src/_internal/platform/configuration/common/configurationService.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.d.ts +1 -0
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.js +13 -3
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/triggerOptions.d.ts +8 -0
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/triggerOptions.d.ts.map +1 -0
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/triggerOptions.js +17 -0
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/triggerOptions.js.map +1 -0
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditLogContext.js +5 -5
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditLogContext.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/node/inlineEditsModelService.js +2 -35
- package/dist/src/_internal/platform/inlineEdits/node/inlineEditsModelService.js.map +1 -1
- package/dist/src/_internal/platform/nesFetch/common/responseStream.js +2 -35
- package/dist/src/_internal/platform/nesFetch/common/responseStream.js.map +1 -1
- package/dist/src/_internal/platform/nesFetch/node/completionsFetchServiceImpl.js +3 -36
- package/dist/src/_internal/platform/nesFetch/node/completionsFetchServiceImpl.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/fetcherService.d.ts +43 -1
- package/dist/src/_internal/platform/networking/common/fetcherService.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/fetcherService.js +29 -4
- package/dist/src/_internal/platform/networking/common/fetcherService.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/networking.d.ts +35 -4
- package/dist/src/_internal/platform/networking/common/networking.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/networking.js +21 -6
- package/dist/src/_internal/platform/networking/common/networking.js.map +1 -1
- package/dist/src/_internal/platform/proxyModels/node/proxyModelsService.js +4 -37
- package/dist/src/_internal/platform/proxyModels/node/proxyModelsService.js.map +1 -1
- package/dist/src/_internal/util/common/errors.d.ts +4 -2
- package/dist/src/_internal/util/common/errors.d.ts.map +1 -1
- package/dist/src/_internal/util/common/errors.js +16 -12
- package/dist/src/_internal/util/common/errors.js.map +1 -1
- package/dist/src/_internal/util/common/result.js +4 -37
- package/dist/src/_internal/util/common/result.js.map +1 -1
- package/dist/src/main.d.ts.map +1 -1
- package/dist/src/main.js +1 -0
- package/dist/src/main.js.map +1 -1
- package/dist/src/package.json +101 -81
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responseStream.js","sourceRoot":"","sources":["../../../../../../src/_internal/platform/nesFetch/common/responseStream.ts"],"names":[],"mappings":";AAAA;;;gGAGgG
|
|
1
|
+
{"version":3,"file":"responseStream.js","sourceRoot":"","sources":["../../../../../../src/_internal/platform/nesFetch/common/responseStream.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,52 +3,19 @@
|
|
|
3
3
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
4
4
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
5
5
|
*--------------------------------------------------------------------------------------------*/
|
|
6
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
7
|
-
if (k2 === undefined) k2 = k;
|
|
8
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
9
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
10
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
11
|
-
}
|
|
12
|
-
Object.defineProperty(o, k2, desc);
|
|
13
|
-
}) : (function(o, m, k, k2) {
|
|
14
|
-
if (k2 === undefined) k2 = k;
|
|
15
|
-
o[k2] = m[k];
|
|
16
|
-
}));
|
|
17
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
18
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
19
|
-
}) : function(o, v) {
|
|
20
|
-
o["default"] = v;
|
|
21
|
-
});
|
|
22
6
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
23
7
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
24
8
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
25
9
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
26
10
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
27
11
|
};
|
|
28
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
29
|
-
var ownKeys = function(o) {
|
|
30
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
31
|
-
var ar = [];
|
|
32
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
33
|
-
return ar;
|
|
34
|
-
};
|
|
35
|
-
return ownKeys(o);
|
|
36
|
-
};
|
|
37
|
-
return function (mod) {
|
|
38
|
-
if (mod && mod.__esModule) return mod;
|
|
39
|
-
var result = {};
|
|
40
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
41
|
-
__setModuleDefault(result, mod);
|
|
42
|
-
return result;
|
|
43
|
-
};
|
|
44
|
-
})();
|
|
45
12
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
46
13
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
47
14
|
};
|
|
48
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
49
16
|
exports.CompletionsFetchService = void 0;
|
|
50
17
|
const asyncIterableUtils_1 = require("../../../util/common/asyncIterableUtils");
|
|
51
|
-
const
|
|
18
|
+
const errors_1 = require("../../../util/common/errors");
|
|
52
19
|
const result_1 = require("../../../util/common/result");
|
|
53
20
|
const codicons_1 = require("../../../util/vs/base/common/codicons");
|
|
54
21
|
const authentication_1 = require("../../authentication/common/authentication");
|
|
@@ -145,7 +112,7 @@ let CompletionsFetchService = class CompletionsFetchService {
|
|
|
145
112
|
if (reason instanceof Error && reason.message === 'This operation was aborted') {
|
|
146
113
|
return result_1.Result.error(new completionsFetchService_1.Completions.RequestCancelled());
|
|
147
114
|
}
|
|
148
|
-
const error =
|
|
115
|
+
const error = errors_1.ErrorUtils.fromUnknown(reason);
|
|
149
116
|
return result_1.Result.error(new completionsFetchService_1.Completions.Unexpected(error));
|
|
150
117
|
}
|
|
151
118
|
}
|
|
@@ -279,7 +246,7 @@ async function* streamWithCleanup(stream, cleanupDisposable) {
|
|
|
279
246
|
}
|
|
280
247
|
}
|
|
281
248
|
catch (err) {
|
|
282
|
-
const error =
|
|
249
|
+
const error = errors_1.ErrorUtils.fromUnknown(err);
|
|
283
250
|
throw error;
|
|
284
251
|
}
|
|
285
252
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completionsFetchServiceImpl.js","sourceRoot":"","sources":["../../../../../../src/_internal/platform/nesFetch/node/completionsFetchServiceImpl.ts"],"names":[],"mappings":";AAAA;;;gGAGgG
|
|
1
|
+
{"version":3,"file":"completionsFetchServiceImpl.js","sourceRoot":"","sources":["../../../../../../src/_internal/platform/nesFetch/node/completionsFetchServiceImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { Event } from '../../../util/vs/base/common/event';
|
|
1
2
|
export declare const IFetcherService: import("../../../util/common/services").ServiceIdentifier<IFetcherService>;
|
|
2
3
|
export interface IFetcherService {
|
|
3
4
|
readonly _serviceBrand: undefined;
|
|
5
|
+
readonly onDidFetch: Event<FetchEvent>;
|
|
4
6
|
getUserAgentLibrary(): string;
|
|
5
7
|
fetch(url: string, options: FetchOptions): Promise<Response>;
|
|
6
8
|
disconnectAll(): Promise<unknown>;
|
|
@@ -12,17 +14,55 @@ export interface IFetcherService {
|
|
|
12
14
|
getUserMessageForFetcherError(err: any): string;
|
|
13
15
|
fetchWithPagination<T>(baseUrl: string, options: PaginationOptions<T>): Promise<T[]>;
|
|
14
16
|
}
|
|
17
|
+
export type FetchEvent = {
|
|
18
|
+
internalId: string;
|
|
19
|
+
timestamp: number;
|
|
20
|
+
outcome: 'success';
|
|
21
|
+
phase: 'requestResponse';
|
|
22
|
+
fetcher: FetcherId;
|
|
23
|
+
hostname: string;
|
|
24
|
+
statusCode: number;
|
|
25
|
+
} | {
|
|
26
|
+
internalId: string;
|
|
27
|
+
timestamp: number;
|
|
28
|
+
outcome: 'success';
|
|
29
|
+
phase: 'responseStreaming';
|
|
30
|
+
fetcher: FetcherId;
|
|
31
|
+
hostname: string;
|
|
32
|
+
bytesReceived: number;
|
|
33
|
+
} | {
|
|
34
|
+
internalId: string;
|
|
35
|
+
timestamp: number;
|
|
36
|
+
outcome: 'error' | 'cancel';
|
|
37
|
+
phase: 'requestResponse';
|
|
38
|
+
fetcher: FetcherId;
|
|
39
|
+
hostname: string;
|
|
40
|
+
reason: any;
|
|
41
|
+
} | {
|
|
42
|
+
internalId: string;
|
|
43
|
+
timestamp: number;
|
|
44
|
+
outcome: 'error' | 'cancel';
|
|
45
|
+
phase: 'responseStreaming';
|
|
46
|
+
fetcher: FetcherId;
|
|
47
|
+
hostname: string;
|
|
48
|
+
reason: any;
|
|
49
|
+
bytesReceived: number;
|
|
50
|
+
};
|
|
51
|
+
export type ReportFetchEvent = (outcome: FetchEvent) => void;
|
|
15
52
|
/** A basic version of http://developer.mozilla.org/en-US/docs/Web/API/Response */
|
|
16
53
|
export declare class Response {
|
|
17
54
|
readonly status: number;
|
|
18
55
|
readonly statusText: string;
|
|
19
56
|
readonly headers: IHeaders;
|
|
20
57
|
readonly fetcher: FetcherId;
|
|
58
|
+
private readonly _reportEvent;
|
|
59
|
+
private readonly _internalId;
|
|
60
|
+
private readonly _hostname;
|
|
21
61
|
ok: boolean;
|
|
22
62
|
readonly body: DestroyableStream<Uint8Array>;
|
|
23
63
|
private _bytesReceived;
|
|
24
64
|
get bytesReceived(): number;
|
|
25
|
-
constructor(status: number, statusText: string, headers: IHeaders, body: ReadableStream<Uint8Array> | null, fetcher: FetcherId);
|
|
65
|
+
constructor(status: number, statusText: string, headers: IHeaders, body: ReadableStream<Uint8Array> | null, fetcher: FetcherId, _reportEvent: ReportFetchEvent, _internalId: string, _hostname: string);
|
|
26
66
|
static fromText(status: number, statusText: string, headers: IHeaders, body: string, fetcher: FetcherId): Response;
|
|
27
67
|
text(): Promise<string>;
|
|
28
68
|
json(): Promise<any>;
|
|
@@ -96,4 +136,6 @@ export declare class DestroyableStream<T> implements AsyncIterable<T> {
|
|
|
96
136
|
destroy(): Promise<void>;
|
|
97
137
|
}
|
|
98
138
|
export declare function jsonVerboseError(resp: Response): Promise<any>;
|
|
139
|
+
export declare function isAbortError(e: any): boolean;
|
|
140
|
+
export declare function safeGetHostname(url: string): string;
|
|
99
141
|
//# sourceMappingURL=fetcherService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetcherService.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/platform/networking/common/fetcherService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fetcherService.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/platform/networking/common/fetcherService.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,8 @@
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.DestroyableStream = exports.Response = exports.IFetcherService = void 0;
|
|
8
8
|
exports.jsonVerboseError = jsonVerboseError;
|
|
9
|
+
exports.isAbortError = isAbortError;
|
|
10
|
+
exports.safeGetHostname = safeGetHostname;
|
|
9
11
|
const services_1 = require("../../../util/common/services");
|
|
10
12
|
exports.IFetcherService = (0, services_1.createServiceIdentifier)('IFetcherService');
|
|
11
13
|
/** A basic version of http://developer.mozilla.org/en-US/docs/Web/API/Response */
|
|
@@ -13,19 +15,30 @@ class Response {
|
|
|
13
15
|
get bytesReceived() {
|
|
14
16
|
return this._bytesReceived;
|
|
15
17
|
}
|
|
16
|
-
constructor(status, statusText, headers, body, fetcher) {
|
|
18
|
+
constructor(status, statusText, headers, body, fetcher, _reportEvent, _internalId, _hostname) {
|
|
17
19
|
this.status = status;
|
|
18
20
|
this.statusText = statusText;
|
|
19
21
|
this.headers = headers;
|
|
20
22
|
this.fetcher = fetcher;
|
|
23
|
+
this._reportEvent = _reportEvent;
|
|
24
|
+
this._internalId = _internalId;
|
|
25
|
+
this._hostname = _hostname;
|
|
21
26
|
this.ok = this.status >= 200 && this.status < 300;
|
|
22
27
|
this._bytesReceived = 0;
|
|
23
|
-
const
|
|
28
|
+
const transformer = {
|
|
24
29
|
transform: (chunk, controller) => {
|
|
25
30
|
this._bytesReceived += chunk.length;
|
|
26
31
|
controller.enqueue(chunk);
|
|
32
|
+
},
|
|
33
|
+
flush: () => {
|
|
34
|
+
this._reportEvent({ internalId: this._internalId, timestamp: Date.now(), outcome: 'success', phase: 'responseStreaming', fetcher: this.fetcher, hostname: this._hostname, bytesReceived: this._bytesReceived });
|
|
35
|
+
},
|
|
36
|
+
cancel: (reason) => {
|
|
37
|
+
const outcome = reason && !isAbortError(reason) ? 'error' : 'cancel';
|
|
38
|
+
this._reportEvent({ internalId: this._internalId, timestamp: Date.now(), outcome, phase: 'responseStreaming', fetcher: this.fetcher, hostname: this._hostname, reason, bytesReceived: this._bytesReceived });
|
|
27
39
|
}
|
|
28
|
-
}
|
|
40
|
+
};
|
|
41
|
+
const countingStream = new TransformStream(transformer);
|
|
29
42
|
const inputStream = body ?? new ReadableStream({ start(c) { c.close(); } });
|
|
30
43
|
this.body = new DestroyableStream(inputStream.pipeThrough(countingStream));
|
|
31
44
|
}
|
|
@@ -35,7 +48,7 @@ class Response {
|
|
|
35
48
|
controller.enqueue(new TextEncoder().encode(body));
|
|
36
49
|
controller.close();
|
|
37
50
|
}
|
|
38
|
-
}), fetcher);
|
|
51
|
+
}), fetcher, () => { }, 'in-memory', 'in-memory');
|
|
39
52
|
}
|
|
40
53
|
async text() {
|
|
41
54
|
const chunks = [];
|
|
@@ -129,4 +142,16 @@ async function jsonVerboseError(resp) {
|
|
|
129
142
|
throw err;
|
|
130
143
|
}
|
|
131
144
|
}
|
|
145
|
+
function isAbortError(e) {
|
|
146
|
+
// see https://github.com/nodejs/node/issues/38361#issuecomment-1683839467
|
|
147
|
+
return e && e.name === 'AbortError';
|
|
148
|
+
}
|
|
149
|
+
function safeGetHostname(url) {
|
|
150
|
+
try {
|
|
151
|
+
return new URL(url).hostname;
|
|
152
|
+
}
|
|
153
|
+
catch {
|
|
154
|
+
return 'unknown';
|
|
155
|
+
}
|
|
156
|
+
}
|
|
132
157
|
//# sourceMappingURL=fetcherService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetcherService.js","sourceRoot":"","sources":["../../../../../../src/_internal/platform/networking/common/fetcherService.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;
|
|
1
|
+
{"version":3,"file":"fetcherService.js","sourceRoot":"","sources":["../../../../../../src/_internal/platform/networking/common/fetcherService.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,16 +3,16 @@ import { Raw } from '@vscode/prompt-tsx';
|
|
|
3
3
|
import type { CancellationToken } from 'vscode';
|
|
4
4
|
import { ITokenizer, TokenizerType } from '../../../util/common/tokenizer';
|
|
5
5
|
import { AsyncIterableObject } from '../../../util/vs/base/common/async';
|
|
6
|
+
import { ServicesAccessor } from '../../../util/vs/platform/instantiation/common/instantiation';
|
|
6
7
|
import { Source } from '../../chat/common/chatMLFetcher';
|
|
7
8
|
import type { ChatLocation, ChatResponse } from '../../chat/common/commonTypes';
|
|
8
|
-
import { ICAPIClientService } from '../../endpoint/common/capiClient';
|
|
9
9
|
import { CustomModel, EndpointEditToolName } from '../../endpoint/common/endpointProvider';
|
|
10
10
|
import { ILogService } from '../../log/common/logService';
|
|
11
11
|
import { ITelemetryService, TelemetryProperties } from '../../telemetry/common/telemetry';
|
|
12
12
|
import { TelemetryData } from '../../telemetry/common/telemetryData';
|
|
13
13
|
import { AnthropicMessagesTool, ContextManagement } from './anthropic';
|
|
14
14
|
import { FinishedCallback, OpenAiFunctionTool, OpenAiResponsesFunctionTool, OptionalChatRequestParams, Prediction } from './fetch';
|
|
15
|
-
import { FetcherId, FetchOptions, IAbortController,
|
|
15
|
+
import { FetcherId, FetchOptions, IAbortController, PaginationOptions, Response } from './fetcherService';
|
|
16
16
|
import { ChatCompletion, OpenAIContextManagement, RawMessageConversionCallback } from './openai';
|
|
17
17
|
/**
|
|
18
18
|
* Encapsulates all the functionality related to making GET/POST requests using
|
|
@@ -166,6 +166,11 @@ export interface IMakeChatRequestOptions {
|
|
|
166
166
|
canRetryOnceWithoutRollback?: boolean;
|
|
167
167
|
/** Custom metadata to be displayed in the log document */
|
|
168
168
|
customMetadata?: Record<string, string | number | boolean | undefined>;
|
|
169
|
+
/**
|
|
170
|
+
* Options for the kind of request being made (e.g. subagent). Controls the X-Interaction-Type header.
|
|
171
|
+
* See notes on each interface.
|
|
172
|
+
*/
|
|
173
|
+
requestKindOptions?: IBackgroundRequestOptions | ISubagentRequestOptions;
|
|
169
174
|
}
|
|
170
175
|
export type IChatRequestTelemetryProperties = {
|
|
171
176
|
requestId?: string;
|
|
@@ -243,9 +248,35 @@ export interface IChatEndpoint extends IEndpoint {
|
|
|
243
248
|
}
|
|
244
249
|
/** Function to create a standard request body for CAPI completions */
|
|
245
250
|
export declare function createCapiRequestBody(options: ICreateEndpointBodyOptions, model: string, callback?: RawMessageConversionCallback): IEndpointBody;
|
|
251
|
+
export interface INetworkRequestOptions {
|
|
252
|
+
readonly requestType: 'GET' | 'POST';
|
|
253
|
+
readonly endpointOrUrl: IEndpoint | string | RequestMetadata;
|
|
254
|
+
readonly secretKey: string;
|
|
255
|
+
readonly intent: string;
|
|
256
|
+
readonly requestId: string;
|
|
257
|
+
readonly body?: IEndpointBody;
|
|
258
|
+
readonly additionalHeaders?: Record<string, string>;
|
|
259
|
+
readonly cancelToken?: CancellationToken;
|
|
260
|
+
readonly useFetcher?: FetcherId;
|
|
261
|
+
readonly canRetryOnce?: boolean;
|
|
262
|
+
readonly location?: ChatLocation;
|
|
263
|
+
readonly requestKindOptions?: IBackgroundRequestOptions | ISubagentRequestOptions;
|
|
264
|
+
}
|
|
265
|
+
/**
|
|
266
|
+
* A background request is one that is not associated with a user request.
|
|
267
|
+
*/
|
|
268
|
+
export interface IBackgroundRequestOptions {
|
|
269
|
+
readonly kind: 'background';
|
|
270
|
+
}
|
|
271
|
+
/**
|
|
272
|
+
* A subagent request is a request made by a subagent, indicated with a subAgentInvocationId included in the request from VS Code.
|
|
273
|
+
*/
|
|
274
|
+
export interface ISubagentRequestOptions {
|
|
275
|
+
readonly kind: 'subagent';
|
|
276
|
+
}
|
|
246
277
|
export declare function canRetryOnceNetworkError(reason: any): boolean;
|
|
247
|
-
export declare function postRequest(
|
|
248
|
-
export declare function getRequest(
|
|
278
|
+
export declare function postRequest(accessor: ServicesAccessor, options: Omit<INetworkRequestOptions, 'requestType'>): Promise<Response>;
|
|
279
|
+
export declare function getRequest(accessor: ServicesAccessor, options: Omit<INetworkRequestOptions, 'requestType'>): Promise<Response>;
|
|
249
280
|
export declare const IHeaderContributors: import("../../../util/common/services").ServiceIdentifier<HeaderContributors>;
|
|
250
281
|
export interface IHeaderContributors {
|
|
251
282
|
readonly _serviceBrand: undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networking.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/platform/networking/common/networking.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"networking.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/platform/networking/common/networking.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,9 @@ exports.getRequest = getRequest;
|
|
|
13
13
|
const services_1 = require("../../../util/common/services");
|
|
14
14
|
const tokenizer_1 = require("../../../util/common/tokenizer");
|
|
15
15
|
const errors_1 = require("../../../util/vs/base/common/errors");
|
|
16
|
+
const capiClient_1 = require("../../endpoint/common/capiClient");
|
|
17
|
+
const telemetry_1 = require("../../telemetry/common/telemetry");
|
|
18
|
+
const fetcherService_1 = require("./fetcherService");
|
|
16
19
|
const openai_1 = require("./openai");
|
|
17
20
|
exports.userAgentLibraryHeader = 'X-VSCode-User-Agent-Library-Version';
|
|
18
21
|
// The maximum time to wait for a request to complete.
|
|
@@ -38,7 +41,11 @@ function createCapiRequestBody(options, model, callback) {
|
|
|
38
41
|
}
|
|
39
42
|
return request;
|
|
40
43
|
}
|
|
41
|
-
function networkRequest(
|
|
44
|
+
function networkRequest(accessor, options) {
|
|
45
|
+
const fetcher = accessor.get(fetcherService_1.IFetcherService);
|
|
46
|
+
const telemetryService = accessor.get(telemetry_1.ITelemetryService);
|
|
47
|
+
const capiClientService = accessor.get(capiClient_1.ICAPIClientService);
|
|
48
|
+
const { requestType, endpointOrUrl, secretKey, intent, requestId, body, additionalHeaders, cancelToken, useFetcher, canRetryOnce = true, location } = options;
|
|
42
49
|
// TODO @lramos15 Eventually don't even construct this fake endpoint object.
|
|
43
50
|
const endpoint = typeof endpointOrUrl === 'string' || 'type' in endpointOrUrl ? {
|
|
44
51
|
modelMaxPromptTokens: 0,
|
|
@@ -51,15 +58,23 @@ function networkRequest(fetcher, telemetryService, capiClientService, requestTyp
|
|
|
51
58
|
name: '',
|
|
52
59
|
version: '',
|
|
53
60
|
} : endpointOrUrl;
|
|
61
|
+
const agentInteractionType = options.requestKindOptions?.kind === 'subagent' ?
|
|
62
|
+
'conversation-subagent' :
|
|
63
|
+
options.requestKindOptions?.kind === 'background' ?
|
|
64
|
+
'conversation-background' :
|
|
65
|
+
intent === 'conversation-agent' ? intent : undefined;
|
|
54
66
|
const headers = {
|
|
55
67
|
Authorization: `Bearer ${secretKey}`,
|
|
56
68
|
'X-Request-Id': requestId,
|
|
57
|
-
'X-Interaction-Type': intent,
|
|
58
69
|
'OpenAI-Intent': intent, // Tells CAPI who flighted this request. Helps find buggy features
|
|
59
70
|
'X-GitHub-Api-Version': '2025-05-01',
|
|
60
71
|
...additionalHeaders,
|
|
61
72
|
...(endpoint.getExtraHeaders ? endpoint.getExtraHeaders(location) : {}),
|
|
62
73
|
};
|
|
74
|
+
if (agentInteractionType) {
|
|
75
|
+
headers['X-Interaction-Type'] = agentInteractionType;
|
|
76
|
+
headers['X-Agent-Task-Id'] = requestId;
|
|
77
|
+
}
|
|
63
78
|
if (endpoint.interceptBody) {
|
|
64
79
|
endpoint.interceptBody(body);
|
|
65
80
|
}
|
|
@@ -118,11 +133,11 @@ function canRetryOnceNetworkError(reason) {
|
|
|
118
133
|
'ERR_HTTP2_PROTOCOL_ERROR',
|
|
119
134
|
].includes(reason?.code);
|
|
120
135
|
}
|
|
121
|
-
function postRequest(
|
|
122
|
-
return networkRequest(
|
|
136
|
+
function postRequest(accessor, options) {
|
|
137
|
+
return networkRequest(accessor, { ...options, requestType: 'POST' });
|
|
123
138
|
}
|
|
124
|
-
function getRequest(
|
|
125
|
-
return networkRequest(
|
|
139
|
+
function getRequest(accessor, options) {
|
|
140
|
+
return networkRequest(accessor, { ...options, requestType: 'GET' });
|
|
126
141
|
}
|
|
127
142
|
exports.IHeaderContributors = (0, services_1.createServiceIdentifier)('headerContributors');
|
|
128
143
|
class HeaderContributors {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networking.js","sourceRoot":"","sources":["../../../../../../src/_internal/platform/networking/common/networking.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;
|
|
1
|
+
{"version":3,"file":"networking.js","sourceRoot":"","sources":["../../../../../../src/_internal/platform/networking/common/networking.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,52 +3,19 @@
|
|
|
3
3
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
4
4
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
5
5
|
*--------------------------------------------------------------------------------------------*/
|
|
6
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
7
|
-
if (k2 === undefined) k2 = k;
|
|
8
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
9
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
10
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
11
|
-
}
|
|
12
|
-
Object.defineProperty(o, k2, desc);
|
|
13
|
-
}) : (function(o, m, k, k2) {
|
|
14
|
-
if (k2 === undefined) k2 = k;
|
|
15
|
-
o[k2] = m[k];
|
|
16
|
-
}));
|
|
17
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
18
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
19
|
-
}) : function(o, v) {
|
|
20
|
-
o["default"] = v;
|
|
21
|
-
});
|
|
22
6
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
23
7
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
24
8
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
25
9
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
26
10
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
27
11
|
};
|
|
28
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
29
|
-
var ownKeys = function(o) {
|
|
30
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
31
|
-
var ar = [];
|
|
32
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
33
|
-
return ar;
|
|
34
|
-
};
|
|
35
|
-
return ownKeys(o);
|
|
36
|
-
};
|
|
37
|
-
return function (mod) {
|
|
38
|
-
if (mod && mod.__esModule) return mod;
|
|
39
|
-
var result = {};
|
|
40
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
41
|
-
__setModuleDefault(result, mod);
|
|
42
|
-
return result;
|
|
43
|
-
};
|
|
44
|
-
})();
|
|
45
12
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
46
13
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
47
14
|
};
|
|
48
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
49
16
|
exports.ProxyModelsService = void 0;
|
|
50
17
|
const util_1 = require("util");
|
|
51
|
-
const
|
|
18
|
+
const errors_1 = require("../../../util/common/errors");
|
|
52
19
|
const cancellation_1 = require("../../../util/vs/base/common/cancellation");
|
|
53
20
|
const event_1 = require("../../../util/vs/base/common/event");
|
|
54
21
|
const lifecycle_1 = require("../../../util/vs/base/common/lifecycle");
|
|
@@ -84,7 +51,7 @@ let ProxyModelsService = class ProxyModelsService extends lifecycle_1.Disposable
|
|
|
84
51
|
this._models = models;
|
|
85
52
|
this._onModelListUpdated.fire();
|
|
86
53
|
}).catch((e) => {
|
|
87
|
-
const err =
|
|
54
|
+
const err = errors_1.ErrorUtils.fromUnknown(e);
|
|
88
55
|
this._logService.error(err, 'Failed to fetch models in autorun');
|
|
89
56
|
});
|
|
90
57
|
reader.store.add({ dispose: () => cts.dispose(true) });
|
|
@@ -118,7 +85,7 @@ let ProxyModelsService = class ProxyModelsService extends lifecycle_1.Disposable
|
|
|
118
85
|
});
|
|
119
86
|
}
|
|
120
87
|
catch (e) {
|
|
121
|
-
const err =
|
|
88
|
+
const err = errors_1.ErrorUtils.fromUnknown(e);
|
|
122
89
|
this._logService.error(err, 'Failed to fetch model list');
|
|
123
90
|
return;
|
|
124
91
|
}
|
|
@@ -138,7 +105,7 @@ let ProxyModelsService = class ProxyModelsService extends lifecycle_1.Disposable
|
|
|
138
105
|
return validatedData.content;
|
|
139
106
|
}
|
|
140
107
|
catch (e) {
|
|
141
|
-
const err =
|
|
108
|
+
const err = errors_1.ErrorUtils.fromUnknown(e);
|
|
142
109
|
this._logService.error(err, 'Failed to process /models response');
|
|
143
110
|
return;
|
|
144
111
|
}
|