Merge pull request #91 from arshad-yaseen/website

Monacopilot Website
arshad-yaseen · Dec 22, 2024 · b701bc5 · b701bc5
2 parents 9bae559 + 0c672a2
commit b701bc5
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 32 deletions.
diff --git a/src/constants/completion.ts b/src/constants/completion.ts
@@ -0,0 +1,2 @@
+export const DEFAULT_COMPLETION_TEMPERATURE = 0.1 as const;
+export const DEFAULT_COMPLETION_MAX_TOKENS = 500 as const;
diff --git a/src/constants/copilot.ts b/src/constants/copilot.ts
@@ -36,5 +36,3 @@ export const COPILOT_PROVIDER_ENDPOINT_MAP: Record<CopilotProvider, string> = {
   anthropic: 'https://api.anthropic.com/v1/messages',
   google: 'https://generativelanguage.googleapis.com/v1beta/models',
 } as const;
-
-export const DEFAULT_COPILOT_TEMPERATURE = 0.1 as const;
diff --git a/src/constants/provider/anthropic.ts b/src/constants/provider/anthropic.ts
diff --git a/src/helpers/completion/index.ts b/src/helpers/completion/index.ts
@@ -12,7 +12,6 @@ import {
 import {
   getCharAfterCursor,
   getTextAfterCursor,
-  getTextAfterCursorInLine,
   getTextBeforeCursor,
   HTTP,
   keepNLines,
@@ -135,7 +134,7 @@ const determineCompletionMode = (
   mdl: EditorModel,
 ): CompletionMode => {
   const charAfterCursor = getCharAfterCursor(pos, mdl);
-  const textAfterCursor = getTextAfterCursorInLine(pos, mdl);
+  const textAfterCursor = getTextAfterCursor(pos, mdl);
 
   if (charAfterCursor) {
     return 'insert';

diff --git a/src/helpers/provider.ts b/src/helpers/provider.ts
@@ -1,9 +1,8 @@
+import {COPILOT_MODEL_IDS, COPILOT_PROVIDER_ENDPOINT_MAP} from '../constants';
 import {
-  COPILOT_MODEL_IDS,
-  COPILOT_PROVIDER_ENDPOINT_MAP,
-  DEFAULT_COPILOT_TEMPERATURE,
-} from '../constants';
-import {MAX_TOKENS_BY_ANTHROPIC_MODEL} from '../constants/provider/anthropic';
+  DEFAULT_COMPLETION_MAX_TOKENS,
+  DEFAULT_COMPLETION_TEMPERATURE,
+} from '../constants/completion';
 import {
   ChatCompletion,
   ChatCompletionCreateParams,
@@ -20,7 +19,8 @@ const openaiHandler: ProviderHandler<'openai'> = {
 
     return {
       model: getModelId(model),
-      ...(!isO1Model && {temperature: DEFAULT_COPILOT_TEMPERATURE}),
+      ...(!isO1Model && {temperature: DEFAULT_COMPLETION_TEMPERATURE}),
+      max_completion_tokens: DEFAULT_COMPLETION_MAX_TOKENS,
       messages: [
         {role: 'system' as const, content: prompt.system},
         {role: 'user' as const, content: prompt.user},
@@ -47,7 +47,8 @@ const groqHandler: ProviderHandler<'groq'> = {
 
   createRequestBody: (model, prompt) => ({
     model: getModelId(model),
-    temperature: DEFAULT_COPILOT_TEMPERATURE,
+    temperature: DEFAULT_COMPLETION_TEMPERATURE,
+    max_tokens: DEFAULT_COMPLETION_MAX_TOKENS,
     messages: [
       {role: 'system' as const, content: prompt.system},
       {role: 'user' as const, content: prompt.user},
@@ -72,10 +73,10 @@ const anthropicHandler: ProviderHandler<'anthropic'> = {
 
   createRequestBody: (model, prompt) => ({
     model: getModelId(model),
-    temperature: DEFAULT_COPILOT_TEMPERATURE,
+    temperature: DEFAULT_COMPLETION_TEMPERATURE,
     system: prompt.system,
     messages: [{role: 'user' as const, content: prompt.user}],
-    max_tokens: MAX_TOKENS_BY_ANTHROPIC_MODEL[model],
+    max_tokens: DEFAULT_COMPLETION_MAX_TOKENS,
   }),
 
   createHeaders: apiKey => ({
@@ -113,6 +114,10 @@ const googleHandler: ProviderHandler<'google'> = {
     system_instruction: {
       parts: {text: prompt.system},
     },
+    generationConfig: {
+      temperature: DEFAULT_COMPLETION_TEMPERATURE,
+      maxOutputTokens: DEFAULT_COMPLETION_MAX_TOKENS,
+    },
     contents: [
       {
         parts: {text: prompt.user},

diff --git a/tests/completion.test.ts b/tests/completion.test.ts
@@ -4,8 +4,8 @@ import {CompletionMetadata, Copilot} from '../src';
 import {
   COPILOT_MODEL_IDS,
   COPILOT_PROVIDER_ENDPOINT_MAP,
-  DEFAULT_COPILOT_TEMPERATURE,
 } from '../src/constants';
+import {DEFAULT_COMPLETION_TEMPERATURE} from '../src/constants/completion';
 import {HTTP} from '../src/utils';
 import {
   MOCK_COMPLETION_CONTENT,
@@ -54,7 +54,7 @@ describe('Completion', () => {
           {role: 'user', content: expect.any(String)},
         ]),
         system: expect.any(String),
-        temperature: DEFAULT_COPILOT_TEMPERATURE,
+        temperature: DEFAULT_COMPLETION_TEMPERATURE,
       }),
       expect.objectContaining({
         headers: expect.any(Object),

diff --git a/tests/ui/src/app/layout.tsx b/tests/ui/src/app/layout.tsx
@@ -5,15 +5,28 @@ export default function RootLayout({
 }>) {
   return (
     <html lang="en">
-      <body
-        style={{
-          minHeight: '100vh',
-          width: '100%',
-          display: 'flex',
-          justifyContent: 'center',
-        }}>
-        {children}
-      </body>
+      <head>
+        <style>{`
+          *, *::before, *::after {
+            box-sizing: border-box;
+            margin: 0;
+            padding: 0;
+          }
+          
+          html {
+            font-size: 16px;
+            -webkit-text-size-adjust: 100%;
+          }
+
+          body {
+            min-height: 100vh;
+            width: 100%;
+            line-height: 1.5;
+            -webkit-font-smoothing: antialiased;
+          }
+        `}</style>
+      </head>
+      <body>{children}</body>
     </html>
   );
 }
diff --git a/tests/ui/src/app/page.tsx b/tests/ui/src/app/page.tsx
@@ -60,4 +60,4 @@ export default function Home() {
       }}
     />
   );
-}
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export const DEFAULT_COMPLETION_TEMPERATURE = 0.1 as const;
		export const DEFAULT_COMPLETION_MAX_TOKENS = 500 as const;
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,4 +60,4 @@ export default function Home() { @@
           }}
         />
       );
-    }
+    }