airbyte-faros-destination 0.18.4 → 0.18.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/lib/converters/common/vcs.d.ts +1 -0
- package/lib/converters/common/vcs.js +3 -1
- package/lib/converters/common/vcs.js.map +1 -1
- package/lib/converters/cursor/daily_usage.js +38 -5
- package/lib/converters/cursor/daily_usage.js.map +1 -1
- package/lib/converters/gitlab/faros_merge_requests.d.ts +2 -0
- package/lib/converters/gitlab/faros_merge_requests.js +39 -6
- package/lib/converters/gitlab/faros_merge_requests.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
|
@@ -83,6 +83,7 @@ export declare enum AssistantMetric {
|
|
|
83
83
|
ChatActiveUsers = "ChatActiveUsers",
|
|
84
84
|
LastActivity = "LastActivity",
|
|
85
85
|
Engagement = "Engagement",
|
|
86
|
+
Usages = "Usages",
|
|
86
87
|
Custom = "Custom"
|
|
87
88
|
}
|
|
88
89
|
export declare function fileKey(filePath: string, repoKey: RepoKey): FileKey;
|
|
@@ -59,6 +59,7 @@ var AssistantMetric;
|
|
|
59
59
|
AssistantMetric["ChatActiveUsers"] = "ChatActiveUsers";
|
|
60
60
|
AssistantMetric["LastActivity"] = "LastActivity";
|
|
61
61
|
AssistantMetric["Engagement"] = "Engagement";
|
|
62
|
+
AssistantMetric["Usages"] = "Usages";
|
|
62
63
|
AssistantMetric["Custom"] = "Custom";
|
|
63
64
|
})(AssistantMetric || (exports.AssistantMetric = AssistantMetric = {}));
|
|
64
65
|
function fileKey(filePath, repoKey) {
|
|
@@ -159,7 +160,8 @@ class BranchCollector {
|
|
|
159
160
|
this.collectedBranches = new Map();
|
|
160
161
|
}
|
|
161
162
|
collectBranch(branchName, repoKey) {
|
|
162
|
-
|
|
163
|
+
var _a;
|
|
164
|
+
if (!branchName || !(repoKey === null || repoKey === void 0 ? void 0 : repoKey.name) || !((_a = repoKey === null || repoKey === void 0 ? void 0 : repoKey.organization) === null || _a === void 0 ? void 0 : _a.uid)) {
|
|
163
165
|
return null;
|
|
164
166
|
}
|
|
165
167
|
const key = this.branchKey(branchName, repoKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vcs.js","sourceRoot":"","sources":["../../../src/converters/common/vcs.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"vcs.js","sourceRoot":"","sources":["../../../src/converters/common/vcs.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,11 +6,28 @@ const faros_js_client_1 = require("faros-js-client");
|
|
|
6
6
|
const lodash_1 = require("lodash");
|
|
7
7
|
const vcs_1 = require("../common/vcs");
|
|
8
8
|
const common_2 = require("./common");
|
|
9
|
-
const
|
|
9
|
+
const DailyUsageItemToAssistantMetricType = {
|
|
10
10
|
acceptedLinesAdded: vcs_1.AssistantMetric.LinesAccepted,
|
|
11
11
|
totalAccepts: vcs_1.AssistantMetric.SuggestionsAccepted,
|
|
12
12
|
totalRejects: vcs_1.AssistantMetric.SuggestionsDiscarded,
|
|
13
13
|
};
|
|
14
|
+
var Feature;
|
|
15
|
+
(function (Feature) {
|
|
16
|
+
Feature["Tab"] = "Tab";
|
|
17
|
+
Feature["Composer"] = "Composer";
|
|
18
|
+
Feature["Chat"] = "Chat";
|
|
19
|
+
Feature["Agent"] = "Agent";
|
|
20
|
+
Feature["CmdK"] = "Cmd+K";
|
|
21
|
+
Feature["BugBot"] = "BugBot";
|
|
22
|
+
})(Feature || (Feature = {}));
|
|
23
|
+
const DailyUsageItemToFeature = {
|
|
24
|
+
totalTabsAccepted: Feature.Tab,
|
|
25
|
+
composerRequests: Feature.Composer,
|
|
26
|
+
chatRequests: Feature.Chat,
|
|
27
|
+
agentRequests: Feature.Agent,
|
|
28
|
+
cmdkUsages: Feature.CmdK,
|
|
29
|
+
bugbotUsages: Feature.BugBot,
|
|
30
|
+
};
|
|
14
31
|
const DEFAULT_CUSTOM_METRICS = [];
|
|
15
32
|
const DAY_MS = 24 * 60 * 60 * 1000;
|
|
16
33
|
class DailyUsage extends common_2.CursorConverter {
|
|
@@ -50,7 +67,7 @@ class DailyUsage extends common_2.CursorConverter {
|
|
|
50
67
|
recordedAt: day.toISOString(),
|
|
51
68
|
},
|
|
52
69
|
});
|
|
53
|
-
for (const [field, assistantMetricType] of Object.entries(
|
|
70
|
+
for (const [field, assistantMetricType] of Object.entries(DailyUsageItemToAssistantMetricType)) {
|
|
54
71
|
const value = dailyUsageItem[field];
|
|
55
72
|
if ((0, lodash_1.isNil)(value)) {
|
|
56
73
|
continue;
|
|
@@ -67,21 +84,36 @@ class DailyUsage extends common_2.CursorConverter {
|
|
|
67
84
|
}
|
|
68
85
|
res.push(...this.getAssistantMetric(day, vcs_1.AssistantMetric.Custom, value, vcs_1.VCSToolDetail.Cursor, dailyUsageItem.email, field));
|
|
69
86
|
}
|
|
87
|
+
for (const [field, feature] of Object.entries(DailyUsageItemToFeature)) {
|
|
88
|
+
const value = dailyUsageItem[field];
|
|
89
|
+
if ((0, lodash_1.isNil)(value)) {
|
|
90
|
+
continue;
|
|
91
|
+
}
|
|
92
|
+
res.push(...this.getAssistantMetric(day, vcs_1.AssistantMetric.Usages, value, vcs_1.VCSToolDetail.Cursor, dailyUsageItem.email, undefined, feature));
|
|
93
|
+
}
|
|
70
94
|
return res;
|
|
71
95
|
}
|
|
72
|
-
getAssistantMetric(day, assistantMetricType, value, org, userEmail, customMetricName) {
|
|
96
|
+
getAssistantMetric(day, assistantMetricType, value, org, userEmail, customMetricName, feature) {
|
|
73
97
|
return [
|
|
74
98
|
{
|
|
75
99
|
model: 'vcs_AssistantMetric',
|
|
76
100
|
record: {
|
|
77
|
-
uid: (0, common_1.digest)([
|
|
101
|
+
uid: (0, common_1.digest)([]
|
|
102
|
+
.concat(
|
|
103
|
+
// original fields (required) to be included in the digest
|
|
104
|
+
...[
|
|
78
105
|
vcs_1.VCSToolDetail.Cursor,
|
|
79
106
|
assistantMetricType,
|
|
80
107
|
day.toISOString(),
|
|
81
108
|
org,
|
|
82
109
|
userEmail,
|
|
83
110
|
customMetricName,
|
|
84
|
-
]
|
|
111
|
+
],
|
|
112
|
+
// newer fields (optional) to be included in the digest
|
|
113
|
+
...[{ key: 'feature', value: feature }]
|
|
114
|
+
.filter((v) => !(0, lodash_1.isNil)(v.value))
|
|
115
|
+
.map((v) => `${v.key}:${v.value}`))
|
|
116
|
+
.join('__')),
|
|
85
117
|
source: this.source,
|
|
86
118
|
startedAt: day,
|
|
87
119
|
endedAt: faros_js_client_1.Utils.toDate(day.getTime() + DAY_MS),
|
|
@@ -100,6 +132,7 @@ class DailyUsage extends common_2.CursorConverter {
|
|
|
100
132
|
category: vcs_1.VCSToolCategory.CodingAssistant,
|
|
101
133
|
detail: vcs_1.VCSToolDetail.Cursor,
|
|
102
134
|
},
|
|
135
|
+
...(feature && { feature }),
|
|
103
136
|
},
|
|
104
137
|
},
|
|
105
138
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daily_usage.js","sourceRoot":"","sources":["../../../src/converters/cursor/daily_usage.ts"],"names":[],"mappings":";;;AACA,wDAAmD;AAEnD,qDAAsC;AACtC,mCAA6B;AAE7B,uCAA8E;AAE9E,qCAAyC;AAEzC,MAAM,
|
|
1
|
+
{"version":3,"file":"daily_usage.js","sourceRoot":"","sources":["../../../src/converters/cursor/daily_usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,11 @@ import { AirbyteRecord } from 'faros-airbyte-cdk';
|
|
|
2
2
|
import { DestinationModel, DestinationRecord, StreamContext } from '../converter';
|
|
3
3
|
import { GitlabConverter } from './common';
|
|
4
4
|
export declare class FarosMergeRequests extends GitlabConverter {
|
|
5
|
+
private readonly branchCollector;
|
|
5
6
|
readonly destinationModels: ReadonlyArray<DestinationModel>;
|
|
6
7
|
id(record: AirbyteRecord): string;
|
|
7
8
|
convert(record: AirbyteRecord, ctx: StreamContext): Promise<ReadonlyArray<DestinationRecord>>;
|
|
9
|
+
onProcessingComplete(ctx: StreamContext): Promise<ReadonlyArray<DestinationRecord>>;
|
|
8
10
|
private extractIdFromGid;
|
|
9
11
|
private pullRequestState;
|
|
10
12
|
}
|
|
@@ -3,16 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.FarosMergeRequests = void 0;
|
|
4
4
|
const faros_js_client_1 = require("faros-js-client");
|
|
5
5
|
const lodash_1 = require("lodash");
|
|
6
|
+
const vcs_1 = require("../common/vcs");
|
|
6
7
|
const common_1 = require("./common");
|
|
7
8
|
class FarosMergeRequests extends common_1.GitlabConverter {
|
|
8
9
|
constructor() {
|
|
9
10
|
super(...arguments);
|
|
11
|
+
this.branchCollector = new vcs_1.BranchCollector();
|
|
10
12
|
this.destinationModels = [
|
|
11
13
|
'vcs_PullRequest',
|
|
12
14
|
'vcs_PullRequestComment',
|
|
13
15
|
'vcs_PullRequestReview',
|
|
14
16
|
'vcs_PullRequestLabel',
|
|
15
17
|
'vcs_Label',
|
|
18
|
+
'vcs_Branch',
|
|
16
19
|
];
|
|
17
20
|
}
|
|
18
21
|
id(record) {
|
|
@@ -21,6 +24,7 @@ class FarosMergeRequests extends common_1.GitlabConverter {
|
|
|
21
24
|
return `${mergeRequest === null || mergeRequest === void 0 ? void 0 : mergeRequest.group_id}_${mergeRequest === null || mergeRequest === void 0 ? void 0 : mergeRequest.project_path}_${mergeRequest === null || mergeRequest === void 0 ? void 0 : mergeRequest.iid}`;
|
|
22
25
|
}
|
|
23
26
|
async convert(record, ctx) {
|
|
27
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
24
28
|
const mergeRequest = record.record.data;
|
|
25
29
|
const source = this.streamName.source;
|
|
26
30
|
// Create organization and repository keys following faros_projects pattern
|
|
@@ -35,6 +39,19 @@ class FarosMergeRequests extends common_1.GitlabConverter {
|
|
|
35
39
|
organization,
|
|
36
40
|
};
|
|
37
41
|
const res = [];
|
|
42
|
+
// Build source repository for cross-project MRs
|
|
43
|
+
const sourceRepository = mergeRequest.sourceProjectId === mergeRequest.targetProjectId
|
|
44
|
+
? repository
|
|
45
|
+
: {
|
|
46
|
+
name: (_b = (_a = mergeRequest.sourceProject) === null || _a === void 0 ? void 0 : _a.path) === null || _b === void 0 ? void 0 : _b.toLowerCase(),
|
|
47
|
+
uid: (_d = (_c = mergeRequest.sourceProject) === null || _c === void 0 ? void 0 : _c.path) === null || _d === void 0 ? void 0 : _d.toLowerCase(),
|
|
48
|
+
organization: {
|
|
49
|
+
uid: (_g = (_f = (_e = mergeRequest.sourceProject) === null || _e === void 0 ? void 0 : _e.group) === null || _f === void 0 ? void 0 : _f.id) === null || _g === void 0 ? void 0 : _g.toLowerCase(),
|
|
50
|
+
source,
|
|
51
|
+
},
|
|
52
|
+
};
|
|
53
|
+
const sourceBranch = this.branchCollector.collectBranch(mergeRequest.sourceBranch, sourceRepository);
|
|
54
|
+
const targetBranch = this.branchCollector.collectBranch(mergeRequest.targetBranch, repository);
|
|
38
55
|
// Create main vcs_PullRequest record
|
|
39
56
|
res.push({
|
|
40
57
|
model: 'vcs_PullRequest',
|
|
@@ -49,18 +66,31 @@ class FarosMergeRequests extends common_1.GitlabConverter {
|
|
|
49
66
|
mergedAt: faros_js_client_1.Utils.toDate(mergeRequest.mergedAt),
|
|
50
67
|
commentCount: mergeRequest.userNotesCount,
|
|
51
68
|
commitCount: mergeRequest.commitCount,
|
|
52
|
-
diffStats: mergeRequest.diffStatsSummary
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
69
|
+
diffStats: mergeRequest.diffStatsSummary
|
|
70
|
+
? {
|
|
71
|
+
linesAdded: mergeRequest.diffStatsSummary
|
|
72
|
+
.additions,
|
|
73
|
+
linesDeleted: mergeRequest.diffStatsSummary
|
|
74
|
+
.deletions,
|
|
75
|
+
filesChanged: mergeRequest.diffStatsSummary
|
|
76
|
+
.fileCount,
|
|
77
|
+
}
|
|
78
|
+
: null,
|
|
57
79
|
author: mergeRequest.author_username
|
|
58
80
|
? { uid: mergeRequest.author_username, source }
|
|
59
81
|
: null,
|
|
60
82
|
mergeCommit: mergeRequest.mergeCommitSha
|
|
61
|
-
? {
|
|
83
|
+
? {
|
|
84
|
+
repository,
|
|
85
|
+
sha: mergeRequest.mergeCommitSha,
|
|
86
|
+
uid: mergeRequest.mergeCommitSha,
|
|
87
|
+
}
|
|
62
88
|
: null,
|
|
63
89
|
repository,
|
|
90
|
+
sourceBranch,
|
|
91
|
+
sourceBranchName: mergeRequest.sourceBranch,
|
|
92
|
+
targetBranch,
|
|
93
|
+
targetBranchName: mergeRequest.targetBranch,
|
|
64
94
|
},
|
|
65
95
|
});
|
|
66
96
|
// Create vcs_PullRequestComment records from notes
|
|
@@ -130,6 +160,9 @@ class FarosMergeRequests extends common_1.GitlabConverter {
|
|
|
130
160
|
}
|
|
131
161
|
return res;
|
|
132
162
|
}
|
|
163
|
+
async onProcessingComplete(ctx) {
|
|
164
|
+
return this.branchCollector.convertBranches();
|
|
165
|
+
}
|
|
133
166
|
extractIdFromGid(gid) {
|
|
134
167
|
// Extract numeric ID from GitLab GID format (e.g., gid://gitlab/Note/2559908301)
|
|
135
168
|
// If it's already a number, return it as is
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"faros_merge_requests.js","sourceRoot":"","sources":["../../../src/converters/gitlab/faros_merge_requests.ts"],"names":[],"mappings":";;;AAEA,qDAAsC;AACtC,mCAA+B;
|
|
1
|
+
{"version":3,"file":"faros_merge_requests.js","sourceRoot":"","sources":["../../../src/converters/gitlab/faros_merge_requests.ts"],"names":[],"mappings":"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"}
|