Merge pull request #151 from yello-xyz/v0.24

V0.24

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## PlayFetch Changelog
 
+### v0.24 - 2024-02-06
+- Linear integration
+- Support for Meta Llama 2 through Hugging Face
+
 ### v0.23 - 2024-01-23
 - Reusable test data
 - Cancel long running LLM requests

README.md

@@ -75,6 +75,14 @@ In order to run the app locally, you will need to add some additional variables
 
 `GITHUB_APP_PRIVATE_KEY=` *[Generate a new private key at https://github.com/organizations/yello-xyz/settings/apps/play-fetch-local]*
 
+- **To use Linear integration:**
+
+`LINEAR_APP_CLIENT_ID=` *[Copy this from https://linear.app/playfetch-dev/settings/api]*
+
+`LINEAR_APP_CLIENT_SECRET=` *[Copy this from https://linear.app/playfetch-dev/settings/api]*
+
+`LINEAR_APP_WEBHOOK_SECRET=` *[Copy this from https://linear.app/playfetch-dev/settings/api]*
+
 - **To use Email authentication:**
 
 `[email protected]`

__tests__/extractVariables.test.ts

@@ -1,6 +1,6 @@
 import { ExtractCodeInterrupts, ExtractPromptVariables, ExtractVariables } from '@/src/common/formatting'
 import { ChainItemWithInputs, Prompts } from '@/types'
-import { DefaultPromptConfig } from '@/src/common/defaultConfig'
+import { DefaultPromptConfig } from '@/src/common/defaults'
 import { ExtractUnboundChainInputs } from '@/components/chains/chainItems'
 
 const testExtractVariables = (testDescription: string, expectedVariables: string[], content: string) =>

__tests__/serialize.test.ts

@@ -1,4 +1,4 @@
-import { DefaultPromptConfig, DefaultPrompts } from '@/src/common/defaultConfig'
+import { DefaultPromptConfig, DefaultPrompts } from '@/src/common/defaults'
 import { deserializePromptVersion, serializePromptVersion } from '@/src/server/serialize'
 import { PromptConfig, Prompts } from '@/types'
 

__tests__/versionsEqual.test.ts

@@ -1,4 +1,4 @@
-import { DefaultPromptConfig } from '@/src/common/defaultConfig'
+import { DefaultPromptConfig } from '@/src/common/defaults'
 import { ChainVersionsAreEqual, PromptVersionsAreEqual } from '@/src/common/versionsEqual'
 import { LanguageModel, PromptConfig, Prompts } from '@/types'
 

cloudbuild.yaml

@@ -26,6 +26,9 @@ steps:
       - 'GITHUB_APP_CLIENT_ID=${_GITHUB_APP_CLIENT_ID}'
       - 'GITHUB_APP_CLIENT_SECRET=${_GITHUB_APP_CLIENT_SECRET}'
       - 'GITHUB_APP_PRIVATE_KEY=${_GITHUB_APP_PRIVATE_KEY}'
+      - 'LINEAR_APP_CLIENT_ID=${_LINEAR_APP_CLIENT_ID}'
+      - 'LINEAR_APP_CLIENT_SECRET=${_LINEAR_APP_CLIENT_SECRET}'
+      - 'LINEAR_APP_WEBHOOK_SECRET=${_LINEAR_APP_WEBHOOK_SECRET}'
       - 'NEXTAUTH_SECRET=${_NEXTAUTH_SECRET}'
       - 'NEXTAUTH_URL=${_NEXTAUTH_URL}'
       - 'NOREPLY_EMAIL_PASSWORD=${_NOREPLY_EMAIL_PASSWORD}'

components/admin/mainAdminPane.tsx

@@ -0,0 +1,84 @@
+import { ActiveUser, ProjectMetrics, RecentProject, User, UserMetrics, WorkspaceMetrics } from '@/types'
+import Waitlist from '@/components/admin/waitlist'
+import { useRouter } from 'next/router'
+import ActiveUsers from '@/components/admin/activeUsers'
+import RecentProjects from '@/components/admin/recentProjects'
+import {
+  ActiveUsersItem,
+  AdminItem,
+  AdminItemIsProject,
+  AdminItemIsUser,
+  RecentProjectsItem,
+  WaitlistItem,
+} from '@/src/common/admin/adminItem'
+import ActiveUserMetrics from '@/components/admin/activeUserMetrics'
+import RecentProjectMetrics from './recentProjectMetrics'
+import RecentWorkspaceMetrics from './workspaceMetrics'
+
+export default function MainAdminPane({
+  adminItem,
+  userMetrics,
+  projectMetrics,
+  workspaceMetrics,
+  activeUsers,
+  recentProjects,
+  waitlistUsers,
+  selectItem,
+  fetchActiveUsersBefore,
+}: {
+  adminItem: AdminItem
+  userMetrics: UserMetrics | null
+  projectMetrics: ProjectMetrics | null
+  workspaceMetrics: WorkspaceMetrics | null
+  activeUsers: ActiveUser[]
+  waitlistUsers: User[]
+  recentProjects: RecentProject[]
+  selectItem: (
+    item: typeof WaitlistItem | typeof ActiveUsersItem | typeof RecentProjectsItem | number,
+    isWorkspace?: boolean
+  ) => void
+  fetchActiveUsersBefore: () => Promise<void>
+}) {
+  const router = useRouter()
+
+  return (
+    <div className='flex flex-col flex-1 bg-gray-25'>
+      {adminItem === WaitlistItem && <Waitlist initialWaitlistUsers={waitlistUsers} />}
+      {adminItem === ActiveUsersItem && (
+        <ActiveUsers activeUsers={activeUsers} onFetchBefore={fetchActiveUsersBefore} onSelectUser={selectItem} />
+      )}
+      {adminItem === RecentProjectsItem && (
+        <RecentProjects
+          recentProjects={recentProjects}
+          onSelectProject={selectItem}
+          onSelectWorkspace={workspaceID => selectItem(workspaceID, true)}
+        />
+      )}
+      {userMetrics && AdminItemIsUser(adminItem) && (
+        <ActiveUserMetrics
+          user={adminItem}
+          metrics={userMetrics}
+          onDismiss={() => router.back()}
+          onSelectProject={selectItem}
+          onSelectWorkspace={workspaceID => selectItem(workspaceID, true)}
+        />
+      )}
+      {projectMetrics && AdminItemIsProject(adminItem) && (
+        <RecentProjectMetrics
+          project={adminItem}
+          projectMetrics={projectMetrics}
+          onSelectUser={selectItem}
+          onDismiss={() => router.back()}
+        />
+      )}
+      {workspaceMetrics && (
+        <RecentWorkspaceMetrics
+          workspaceMetrics={workspaceMetrics}
+          onSelectUser={selectItem}
+          onSelectProject={selectItem}
+          onDismiss={() => router.back()}
+        />
+      )}
+    </div>
+  )
+}

components/chains/chainEditor.tsx

@@ -11,7 +11,7 @@ import {
 import { ChainNode, IsBranchChainItem } from './chainNode'
 import ChainEditorHeader from './chainEditorHeader'
 import SegmentedControl, { Segment } from '../segmentedControl'
-import { ChainPromptCache } from '@/src/client/hooks/useChainPromptCache'
+import { ChainItemCache } from '@/src/client/hooks/useChainItemCache'
 import { Fragment, useState } from 'react'
 import { useCheckProviders } from '@/src/client/context/providerContext'
 import { EmbeddingModels, QueryProviders } from '@/src/common/providerMetadata'
@@ -33,7 +33,7 @@ export default function ChainEditor({
   isTestMode,
   setTestMode,
   disabled,
-  promptCache,
+  itemCache,
 }: {
   chain: ActiveChain
   activeVersion: ChainVersion
@@ -49,7 +49,7 @@ export default function ChainEditor({
   isTestMode: boolean
   setTestMode: (testMode: boolean) => void
   disabled: boolean
-  promptCache: ChainPromptCache
+  itemCache: ChainItemCache
 }) {
   const [checkProviderAvailable, checkModelAvailable] = useCheckProviders()
   const provider = QueryProviders.find(provider => checkProviderAvailable(provider))
@@ -89,7 +89,7 @@ export default function ChainEditor({
   const insertPrompt = (index: number, branch: number, promptID: number, versionID?: number) =>
     insertItem(index, branch, {
       promptID,
-      versionID: versionID ?? promptCache.versionForItem({ promptID })?.id,
+      versionID: versionID ?? itemCache.versionForItem({ promptID })?.id,
     })
 
   const insertNewPrompt = (index: number, branch: number) =>
@@ -145,7 +145,7 @@ export default function ChainEditor({
                 savedVersion={isVersionSaved ? activeVersion : null}
                 setTestMode={setTestMode}
                 prompts={prompts}
-                promptCache={promptCache}
+                itemCache={itemCache}
               />
               {<StartBranchConnector row={row} maxBranch={maxBranch} nodes={nodes} colSpans={colSpans} />}
               {rowIndex < rows.length - 1 && (
@@ -154,6 +154,7 @@ export default function ChainEditor({
                   previousRow={row}
                   nextRow={rows[rowIndex + 1]}
                   maxBranch={maxBranch}
+                  maxNonLoopingBranch={maxNonLoopingBranch}
                   prompts={prompts}
                   isDisabled={isTestMode}
                   activeMenuIndex={activeMenuIndex}

components/chains/chainEditorRow.tsx

@@ -1,9 +1,9 @@
 import { ActiveChain, ChainItem, ChainVersion, Prompt } from '@/types'
 import { ChainNode, IsBranchChainItem, IsChainItem } from './chainNode'
 import { ChainNodeBox } from './chainNodeBox'
-import { ChainPromptCache } from '@/src/client/hooks/useChainPromptCache'
+import { ChainItemCache } from '@/src/client/hooks/useChainItemCache'
 import { FirstBranchForBranchOfNode, ShouldBranchLoopOnCompletion } from '@/src/common/branching'
-import ChainNodeBoxConnector, { DownConnector, DownStroke } from './chainNodeBoxConnector'
+import ChainNodeBoxConnector, { DownArrow, DownStroke } from './chainNodeBoxConnector'
 
 export type InsertActions = {
   insertItem: (index: number, branch: number, item: ChainItem) => void
@@ -45,6 +45,7 @@ const shouldBranchLoopOnCompletion = (nodes: ChainNode[], branch: number) =>
 export const ConnectorRow = (props: {
   nodes: ChainNode[]
   maxBranch: number
+  maxNonLoopingBranch: number
   previousRow: ChainNode[]
   nextRow: ChainNode[]
   isDisabled: boolean
@@ -63,6 +64,7 @@ export const ConnectorRow = (props: {
 const ConnectorCell = ({
   nodes,
   branch,
+  maxNonLoopingBranch,
   previousRow,
   nextRow,
   isDisabled,
@@ -73,6 +75,7 @@ const ConnectorCell = ({
 }: {
   nodes: ChainNode[]
   branch: number
+  maxNonLoopingBranch: number
   previousRow: ChainNode[]
   nextRow: ChainNode[]
   isDisabled: boolean
@@ -104,6 +107,7 @@ const ConnectorCell = ({
       hasPrevious={!!precedingNode && !IsBranchChainItem(precedingNode)}
       hasNext={!!nextNode && IsChainItem(nextNode)}
       hasCompleted={hasCompletedBranch}
+      hasEndBranchConnector={maxNonLoopingBranch > 0}
       {...bindInsertActions(insertActions, index, branch)}
     />
   ) : didStartBranchInColumn(nodes, previousNodeIndex, branch) && !hasCompletedBranch ? (
@@ -127,7 +131,7 @@ export const NodesRow = (props: {
   savedVersion: ChainVersion | null
   setTestMode: (testMode: boolean) => void
   prompts: Prompt[]
-  promptCache: ChainPromptCache
+  itemCache: ChainItemCache
 }) => (
   <>
     {Array.from({ length: props.maxBranch + 1 }, (_, branch) => (
@@ -150,7 +154,7 @@ const NodeCell = ({
   savedVersion,
   setTestMode,
   prompts,
-  promptCache,
+  itemCache,
 }: {
   chain: ActiveChain
   nodes: ChainNode[]
@@ -165,7 +169,7 @@ const NodeCell = ({
   savedVersion: ChainVersion | null
   setTestMode: (testMode: boolean) => void
   prompts: Prompt[]
-  promptCache: ChainPromptCache
+  itemCache: ChainItemCache
 }) => {
   const firstNodeOfRowIndex = nodes.indexOf(row[0])
   const isLastRow = firstNodeOfRowIndex === nodes.length - 1
@@ -216,7 +220,7 @@ const NodeCell = ({
         savedVersion={savedVersion}
         setTestMode={setTestMode}
         prompts={prompts}
-        promptCache={promptCache}
+        itemCache={itemCache}
       />
     )
   ) : !isLastRow && !hasCompletedBranch && didStartBranchInColumn(nodes, firstNodeOfRowIndex, branch) ? (
@@ -291,7 +295,7 @@ export const EndBranchConnector = ({
     />
     <RowFiller start={maxNonLoopingBranch + 1} end={maxBranch} colSpans={colSpans} />
     <div className='flex flex-col items-center'>
-      <DownConnector height='min-h-[18px]' />
+      <DownArrow height='min-h-[18px]' />
     </div>
     <RowFiller start={1} end={maxBranch} colSpans={colSpans} />
   </>

components/chains/chainItems.ts

@@ -7,13 +7,13 @@ import {
   IsQueryChainItem,
   SubtreeForChainNode,
 } from './chainNode'
-import { ChainPromptCache } from '../../src/client/hooks/useChainPromptCache'
+import { ChainItemCache } from '../../src/client/hooks/useChainItemCache'
 import { ExtractCodeInterrupts, ExtractPromptVariables, ExtractVariables } from '@/src/common/formatting'
 
 export const GetChainItemsSaveKey = (items: ChainItem[]) => JSON.stringify(stripItemsToSave(items))
 
-export const GetItemsToSave = (items: ChainItem[], promptCache: ChainPromptCache) =>
-  augmentItemsToSave(stripItemsToSave(items), promptCache)
+export const GetItemsToSave = (items: ChainItem[], itemCache: ChainItemCache) =>
+  augmentItemsToSave(stripItemsToSave(items), itemCache)
 
 const stripItemsToSave = (items: ChainItem[]): ChainItem[] =>
   items.map(item => {
@@ -26,19 +26,19 @@ const stripItemsToSave = (items: ChainItem[]): ChainItem[] =>
         }
   })
 
-const augmentItemsToSave = (items: ChainItem[], promptCache: ChainPromptCache) =>
+const augmentItemsToSave = (items: ChainItem[], itemCache: ChainItemCache) =>
   items.map(item => {
-    const inputs = ExtractChainItemVariables(item, promptCache, false)
+    const inputs = ExtractChainItemVariables(item, itemCache, false)
     return IsCodeChainItem(item) || IsBranchChainItem(item) || IsQueryChainItem(item)
       ? { ...item, inputs }
       : {
           ...item,
           inputs,
-          dynamicInputs: ExtractChainItemVariables(item, promptCache, true).filter(input => !inputs.includes(input)),
+          dynamicInputs: ExtractChainItemVariables(item, itemCache, true).filter(input => !inputs.includes(input)),
         }
   })
 
-export const ExtractChainItemVariables = (item: ChainItem, cache: ChainPromptCache, includingDynamic: boolean) => {
+export const ExtractChainItemVariables = (item: ChainItem, cache: ChainItemCache, includingDynamic: boolean) => {
   if (IsCodeChainItem(item) || IsBranchChainItem(item)) {
     return [...ExtractVariables(item.code), ...(includingDynamic ? ExtractCodeInterrupts(item.code) : [])]
   }
@@ -56,7 +56,7 @@ const extractChainItemInputs = (item: ChainItem, includingDynamic: boolean) => [
   ...(includingDynamic && IsPromptChainItem(item) ? item.dynamicInputs ?? [] : []),
 ]
 
-export const ExtractUnboundChainVariables = (chain: ChainItem[], cache: ChainPromptCache, includingDynamic: boolean) =>
+export const ExtractUnboundChainVariables = (chain: ChainItem[], cache: ChainItemCache, includingDynamic: boolean) =>
   excludeBoundChainVariables(
     chain.map(item => ({ ...item, inputs: ExtractChainItemVariables(item, cache, includingDynamic) }))
   )

components/chains/chainNode.tsx

@@ -1,6 +1,6 @@
 import { LoopCompletionIndexForNode, ShouldBranchLoopOnCompletion, SubtreeForNode } from '@/src/common/branching'
 import { BranchChainItem, ChainItem, CodeChainItem, PromptChainItem, QueryChainItem } from '@/types'
-import { ChainPromptCache } from '@/src/client/hooks/useChainPromptCache'
+import { ChainItemCache } from '@/src/client/hooks/useChainItemCache'
 import { ExtractChainItemVariables } from './chainItems'
 
 export const InputNode = 'input'
@@ -54,11 +54,11 @@ export const CanChainNodeIncludeContext = (chainNode: ChainNode, nodes: ChainNod
 export const MappableTargetInputsForChainNode = (
   chainNode: ChainNode,
   nodes: ChainNode[],
-  promptCache: ChainPromptCache
+  itemCache: ChainItemCache
 ): string[] => [
   ...new Set(
     SubtreeForChainNode(chainNode, nodes, false, true).flatMap(item =>
-      ExtractChainItemVariables(item, promptCache, false)
+      ExtractChainItemVariables(item, itemCache, false)
     )
   ),
 ]

components/chains/chainNodeBox.tsx

@@ -1,6 +1,6 @@
 import { ActiveChain, BranchChainItem, ChainItem, ChainVersion, Prompt } from '@/types'
 import { ChainNode, InputNode, IsBranchChainItem, IsChainItem, OutputNode } from './chainNode'
-import { ChainPromptCache } from '@/src/client/hooks/useChainPromptCache'
+import { ChainItemCache } from '@/src/client/hooks/useChainItemCache'
 import ChainNodeBoxHeader from './chainNodeBoxHeader'
 import ChainNodeBoxBody from './chainNodeBoxBody'
 import ChainNodeBoxFooter from './chainNodeBoxFooter'
@@ -19,7 +19,7 @@ export function ChainNodeBox({
   savedVersion,
   setTestMode,
   prompts,
-  promptCache,
+  itemCache,
 }: {
   chain: ActiveChain
   index: number
@@ -31,7 +31,7 @@ export function ChainNodeBox({
   savedVersion: ChainVersion | null
   setTestMode: (testMode: boolean) => void
   prompts: Prompt[]
-  promptCache: ChainPromptCache
+  itemCache: ChainItemCache
 }) {
   const chainNode = nodes[index]
   const isSelected = index === activeIndex
@@ -98,13 +98,13 @@ export function ChainNodeBox({
           prompts={prompts}
           users={chain.users}
         />
-        <ChainNodeBoxBody chainNode={chainNode} items={items} isSelected={isSelected} promptCache={promptCache} />
+        <ChainNodeBoxBody chainNode={chainNode} items={items} isSelected={isSelected} itemCache={itemCache} />
         <ChainNodeBoxFooter
           nodes={nodes}
           index={index}
           onUpdate={updateItem}
           isSelected={isSelected}
-          promptCache={promptCache}
+          itemCache={itemCache}
         />
         {chainNode !== OutputNode && <SmallDot position='bottom' />}
       </div>