Skip to content

Commit 834bfa0

Browse files
committed
fix: lint
1 parent fae9226 commit 834bfa0

File tree

3 files changed

+0
-47
lines changed

3 files changed

+0
-47
lines changed

docs/llm-providers.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@ When using LLM providers, the following Ansible Lightspeed features are availabl
99
**Supported in Phase 1:**
1010

1111
- Playbook Generation
12-
<<<<<<< HEAD
1312
- Role Generation
14-
=======
15-
- Role Generation
16-
>>>>>>> 84cfad07 (Add LLM provider under lighspeed)
1713
- Interactive Chat (if provider supports it)
1814

1915
**Not Supported in Phase 1:**
@@ -121,11 +117,7 @@ Once configured, LLM providers work seamlessly with existing Ansible Lightspeed
121117
### Role Generation
122118

123119
1. Right-click in an Ansible file
124-
<<<<<<< HEAD
125120
2. Select "Generate Ansible Role with Lightspeed"
126-
=======
127-
2. Select "Generate Ansible Role with Lightspeed"
128-
>>>>>>> 84cfad07 (Add LLM provider under lighspeed)
129121
3. Enter your requirements
130122
4. The configured LLM provider will generate the role structure
131123

src/features/lightspeed/utils/outlineGenerator.ts

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,13 @@ import * as yaml from "yaml";
77
export function generateOutlineFromPlaybook(playbookYaml: string): string {
88
try {
99
const parsed = yaml.parse(playbookYaml);
10-
<<<<<<< HEAD
1110

12-
=======
13-
14-
>>>>>>> 84cfad07 (Add LLM provider under lighspeed)
1511
if (!parsed || !Array.isArray(parsed)) {
1612
return "";
1713
}
1814

1915
const tasks: string[] = [];
20-
<<<<<<< HEAD
2116

22-
=======
23-
24-
>>>>>>> 84cfad07 (Add LLM provider under lighspeed)
2517
// Extract tasks from the playbook
2618
for (const play of parsed) {
2719
if (play.tasks && Array.isArray(play.tasks)) {
@@ -31,11 +23,7 @@ export function generateOutlineFromPlaybook(playbookYaml: string): string {
3123
}
3224
}
3325
}
34-
<<<<<<< HEAD
3526

36-
=======
37-
38-
>>>>>>> 84cfad07 (Add LLM provider under lighspeed)
3927
// Also check pre_tasks and post_tasks
4028
if (play.pre_tasks && Array.isArray(play.pre_tasks)) {
4129
for (const task of play.pre_tasks) {
@@ -44,11 +32,7 @@ export function generateOutlineFromPlaybook(playbookYaml: string): string {
4432
}
4533
}
4634
}
47-
<<<<<<< HEAD
4835

49-
=======
50-
51-
>>>>>>> 84cfad07 (Add LLM provider under lighspeed)
5236
if (play.post_tasks && Array.isArray(play.post_tasks)) {
5337
for (const task of play.post_tasks) {
5438
if (task.name) {
@@ -72,21 +56,13 @@ export function generateOutlineFromPlaybook(playbookYaml: string): string {
7256
export function generateOutlineFromRole(roleYaml: string): string {
7357
try {
7458
const parsed = yaml.parse(roleYaml);
75-
<<<<<<< HEAD
7659

77-
=======
78-
79-
>>>>>>> 84cfad07 (Add LLM provider under lighspeed)
8060
if (!parsed || !Array.isArray(parsed)) {
8161
return "";
8262
}
8363

8464
const tasks: string[] = [];
85-
<<<<<<< HEAD
8665

87-
=======
88-
89-
>>>>>>> 84cfad07 (Add LLM provider under lighspeed)
9066
// Extract task names
9167
for (const task of parsed) {
9268
if (task.name) {
@@ -116,7 +92,3 @@ export function parseOutlineToTaskList(outline: string): string[] {
11692
return line.replace(/^\d+\.\s*/, "");
11793
});
11894
}
119-
<<<<<<< HEAD
120-
=======
121-
122-
>>>>>>> 84cfad07 (Add LLM provider under lighspeed)

test/unit/lightspeed/providerManager.test.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
<<<<<<< HEAD
21
/* eslint-disable @typescript-eslint/no-explicit-any */
3-
=======
4-
>>>>>>> 84cfad07 (Add LLM provider under lighspeed)
52
import { assert } from "chai";
63

74
// Test the provider manager in isolation using dynamic imports
@@ -16,11 +13,7 @@ describe("ProviderManager", () => {
1613
"../../../src/features/lightspeed/providerManager.js"
1714
);
1815
ProviderManager = module.ProviderManager;
19-
<<<<<<< HEAD
20-
} catch {
21-
=======
2216
} catch (error) {
23-
>>>>>>> 84cfad07 (Add LLM provider under lighspeed)
2417
console.log("Could not import ProviderManager, skipping tests");
2518
return;
2619
}
@@ -217,7 +210,3 @@ describe("ProviderManager", () => {
217210
});
218211
});
219212
});
220-
<<<<<<< HEAD
221-
=======
222-
223-
>>>>>>> 84cfad07 (Add LLM provider under lighspeed)

0 commit comments

Comments
 (0)