chore(release): Test v7.38.2

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
       id-token: "write"
     services:
       postgres:
-        image: pgvector/pgvector:0.6.2-pg15
+        image: pgvector/pgvector:0.7.0-pg15
         # This env variables must be the same in the file PARABOL_BUILD_ENV_PATH
         env:
           POSTGRES_PASSWORD: "temppassword"

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
       id-token: "write"
     services:
       postgres:
-        image: pgvector/pgvector:0.6.2-pg15
+        image: pgvector/pgvector:0.7.0-pg15
         # This env variables must be the same in the file PARABOL_BUILD_ENV_PATH
         env:
           POSTGRES_PASSWORD: "temppassword"

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "7.38.1"
+  ".": "7.38.2"
 }

CHANGELOG.md

@@ -5,6 +5,20 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.38.2](https://github.com/ParabolInc/parabol/compare/v7.38.1...v7.38.2) (2024-07-08)
+
+
+### Fixed
+
+* Read embedder URL from env ([#9936](https://github.com/ParabolInc/parabol/issues/9936)) ([0a60ff9](https://github.com/ParabolInc/parabol/commit/0a60ff9b59b33d65ac532d80799f3e7425ee5e54))
+
+
+### Changed
+
+* **client:** when a release happens, links to the specific tag version ([#9937](https://github.com/ParabolInc/parabol/issues/9937)) ([9081e38](https://github.com/ParabolInc/parabol/commit/9081e38f2f44c87941abf35e97b30942f6c9ccd7))
+* **postgres:** Postgres upgraded to 15.7 and pgvector to 0.7.0 ([#9941](https://github.com/ParabolInc/parabol/issues/9941)) ([ef6e626](https://github.com/ParabolInc/parabol/commit/ef6e62629a9eb1b9b4aec75b83ca004cf02919fc))
+* **rethinkdb:** Organization: Phase 2 ([#9931](https://github.com/ParabolInc/parabol/issues/9931)) ([5baad4c](https://github.com/ParabolInc/parabol/commit/5baad4c9843a0189f40decfbcbd8ea7810599ea1))
+
 ## [7.38.1](https://github.com/ParabolInc/parabol/compare/v7.38.0...v7.38.1) (2024-07-04)
 
 

docker/images/postgres/Dockerfile

@@ -1,8 +1,8 @@
-FROM postgres:15.4
-ARG PGVECTOR_VERSION=v0.6.1
+FROM postgres:15.7
+ARG PGVECTOR_VERSION=v0.7.0
 ARG PSQL_MAJOR_VERSION=15
 
-ADD extensions /extensions
+COPY extensions /extensions
 
 RUN apt-get update && apt-get install -y \
     build-essential \

docker/stacks/single-tenant-host/docker-compose.yml

@@ -17,7 +17,7 @@ services:
   postgres:
     container_name: postgres
     profiles: ["databases"]
-    image: pgvector/pgvector:0.6.2-pg15
+    image: pgvector/pgvector:0.7.0-pg15
     restart: always
     env_file: .env
     environment:

package.json

@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.38.1",
+  "version": "7.38.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"

packages/chronos/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.38.1",
+  "version": "7.38.2",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.38.1"
+    "parabol-server": "7.38.2"
   }
 }

packages/client/hooks/useServiceWorkerUpdater.ts

@@ -21,7 +21,7 @@ const useServiceWorkerUpdater = () => {
         action: {
           label: `See what's changed`,
           callback: () => {
-            const url = 'https://github.com/ParabolInc/parabol/releases'
+            const url = `https://github.com/ParabolInc/parabol/releases/tag/v${__APP_VERSION__}`
             window.open(url, '_blank', 'noopener')?.focus()
           }
         }

packages/client/package.json

@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.38.1",
+  "version": "7.38.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"

packages/embedder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.38.1",
+  "version": "7.38.2",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",

packages/gql-executor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.38.1",
+  "version": "7.38.2",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.38.1",
-    "parabol-server": "7.38.1",
+    "parabol-client": "7.38.2",
+    "parabol-server": "7.38.2",
     "undici": "^5.26.2"
   }
 }

packages/integration-tests/package.json

@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.38.1",
+  "version": "7.38.2",
   "description": "",
   "main": "index.js",
   "scripts": {

packages/server/graphql/private/mutations/checkRethinkPgEquality.ts

@@ -4,12 +4,13 @@ import getKysely from '../../../postgres/getKysely'
 import {checkRowCount, checkTableEq} from '../../../postgres/utils/checkEqBase'
 import {
   compareDateAlmostEqual,
-  compareOptionalPlaintextContent,
-  compareRValOptionalPluckedArray,
+  compareRValOptionalPluckedObject,
+  compareRValStringAsNumber,
   compareRValUndefinedAsEmptyArray,
+  compareRValUndefinedAsFalse,
   compareRValUndefinedAsNull,
   compareRValUndefinedAsNullAndTruncateRVal,
-  compareRealNumber,
+  compareRValUndefinedAsZero,
   defaultEqFn
 } from '../../../postgres/utils/rethinkEqualityFns'
 import {MutationResolvers} from '../resolverTypes'
@@ -36,11 +37,11 @@ const checkRethinkPgEquality: MutationResolvers['checkRethinkPgEquality'] = asyn
 ) => {
   const r = await getRethink()
 
-  if (tableName === 'RetroReflection') {
+  if (tableName === 'Organization') {
     const rowCountResult = await checkRowCount(tableName)
     const rethinkQuery = (updatedAt: Date, id: string | number) => {
       return r
-        .table('RetroReflection' as any)
+        .table('Organization' as any)
         .between([updatedAt, id], [r.maxval, r.maxval], {
           index: 'updatedAtId',
           leftBound: 'open',
@@ -50,12 +51,9 @@ const checkRethinkPgEquality: MutationResolvers['checkRethinkPgEquality'] = asyn
     }
     const pgQuery = async (ids: string[]) => {
       return getKysely()
-        .selectFrom('RetroReflection')
+        .selectFrom('Organization')
         .selectAll()
-        .select(({fn}) => [
-          fn('to_json', ['entities']).as('entities'),
-          fn('to_json', ['reactjis']).as('reactjis')
-        ])
+        .select(({fn}) => [fn('to_json', ['creditCard']).as('creditCard')])
         .where('id', 'in', ids)
         .execute()
     }
@@ -64,23 +62,30 @@ const checkRethinkPgEquality: MutationResolvers['checkRethinkPgEquality'] = asyn
       pgQuery,
       {
         id: defaultEqFn,
+        activeDomain: compareRValUndefinedAsNullAndTruncateRVal(100),
+        isActiveDomainTouched: compareRValUndefinedAsFalse,
+        creditCard: compareRValOptionalPluckedObject({
+          brand: compareRValUndefinedAsNull,
+          expiry: compareRValUndefinedAsNull,
+          last4: compareRValStringAsNumber
+        }),
         createdAt: defaultEqFn,
+        name: compareRValUndefinedAsNullAndTruncateRVal(100),
+        payLaterClickCount: compareRValUndefinedAsZero,
+        periodEnd: compareRValUndefinedAsNull,
+        periodStart: compareRValUndefinedAsNull,
+        picture: compareRValUndefinedAsNull,
+        showConversionModal: compareRValUndefinedAsFalse,
+        stripeId: compareRValUndefinedAsNull,
+        stripeSubscriptionId: compareRValUndefinedAsNull,
+        upcomingInvoiceEmailSentAt: compareRValUndefinedAsNull,
+        tier: defaultEqFn,
+        tierLimitExceededAt: compareRValUndefinedAsNull,
+        trialStartDate: compareRValUndefinedAsNull,
+        scheduledLockAt: compareRValUndefinedAsNull,
+        lockedAt: compareRValUndefinedAsNull,
         updatedAt: compareDateAlmostEqual,
-        isActive: defaultEqFn,
-        meetingId: defaultEqFn,
-        promptId: defaultEqFn,
-        creatorId: compareRValUndefinedAsNull,
-        sortOrder: defaultEqFn,
-        reflectionGroupId: defaultEqFn,
-        content: compareRValUndefinedAsNullAndTruncateRVal(2000, 0.19),
-        plaintextContent: compareOptionalPlaintextContent,
-        entities: compareRValOptionalPluckedArray({
-          name: defaultEqFn,
-          salience: compareRealNumber,
-          lemma: compareRValUndefinedAsNull
-        }),
-        reactjis: compareRValUndefinedAsEmptyArray,
-        sentimentScore: compareRValUndefinedAsNull
+        featureFlags: compareRValUndefinedAsEmptyArray
       },
       maxErrors
     )

packages/server/graphql/public/types/User.ts

@@ -28,6 +28,20 @@ import {UserResolvers} from '../resolverTypes'
 
 declare const __PRODUCTION__: string
 
+const MODEL = 'Embeddings_ember_1'
+const EMBED_URL = (() => {
+  try {
+    const availableModels =
+      process.env.AI_EMBEDDING_MODELS && JSON.parse(process.env.AI_EMBEDDING_MODELS)
+    return availableModels.find(
+      ({model}: {model?: string}) => model?.split(':')[1] === 'llmrails/ember-v1'
+    )?.url
+  } catch {
+    return undefined
+  }
+})()
+const SIMILARITY_THRESHOLD = 0.5
+
 const User: UserResolvers = {
   activity: async (_source, {activityId}, {dataLoader}) => {
     const activity = await dataLoader.get('meetingTemplates').load(activityId)
@@ -186,7 +200,7 @@ const User: UserResolvers = {
     return connectionFromTemplateArray(allActivities, first, after)
   },
   templateSearch: async ({id: userId}, {search}, {authToken, dataLoader}) => {
-    if (!search) return []
+    if (!search || !EMBED_URL) return []
     const viewerId = getUserId(authToken)
     const user = await dataLoader.get('users').loadNonNull(userId)
     const teamIds =
@@ -203,16 +217,13 @@ const User: UserResolvers = {
     // all team ids which could have accessible templates
     const allTeamIds = ['aGhostTeam', ...allOrgTeams.map(({id}) => id)]
 
-    const response = await fetch('http://localhost:3040/embed', {
+    const response = await fetch(EMBED_URL, {
       method: 'POST',
       body: JSON.stringify({inputs: search}),
       headers: {'Content-Type': 'application/json'}
     })
     const data = await response.json()
 
-    const MODEL = 'Embeddings_ember_1'
-    const SIMILARITY_THRESHOLD = 0.5
-
     const pg = getKysely()
     const similarEmbeddings = await pg
       .with('Model', (qc) =>

packages/server/package.json

@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.38.1",
+  "version": "7.38.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "openai": "^4.24.1",
     "openapi-fetch": "^0.9.7",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.38.1",
+    "parabol-client": "7.38.2",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",