Merge branch 'main' into improvement/integration-status

CrowdDotDev · Nov 14, 2024 · 3d209f5 · 3d209f5
2 parents a70cfcf + 2f1abf0
commit 3d209f5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/backend/src/database/repositories/organizationRepository.ts b/backend/src/database/repositories/organizationRepository.ts
@@ -1685,7 +1685,9 @@ class OrganizationRepository {
           ? ` INNER JOIN "organizationSegmentsAgg" osa ON osa."organizationId" = o.id AND ${
               segmentId ? `osa."segmentId" = $(segmentId)` : `osa."segmentId" IS NULL`
             }`
-          : ''
+          : ` LEFT JOIN "organizationSegmentsAgg" osa ON osa."organizationId" = o.id AND ${
+              segmentId ? `osa."segmentId" = $(segmentId)` : `osa."segmentId" IS NULL`
+            }`
       }
       WHERE 1=1
         AND o."tenantId" = $(tenantId)

diff --git a/backend/src/services/organizationService.ts b/backend/src/services/organizationService.ts
@@ -1022,7 +1022,7 @@ export default class OrganizationService extends LoggerBase {
         offset,
         segmentId: segments.length > 0 ? segments[0] : undefined,
         fields: ['id', 'segmentId', 'displayName', 'memberCount', 'activityCount', 'logo'],
-        include: { aggregates: true, identities: false, lfxMemberships: true },
+        include: { aggregates: false, identities: false, lfxMemberships: true },
       },
       this.options,
     )

diff --git a/services/apps/merge_suggestions_worker/src/workflows/mergeMembersWithLLM.ts b/services/apps/merge_suggestions_worker/src/workflows/mergeMembersWithLLM.ts
@@ -23,8 +23,8 @@ export async function mergeMembersWithLLM(
   args: IProcessMergeMemberSuggestionsWithLLM,
 ): Promise<void> {
   const SUGGESTIONS_PER_RUN = 10
-  const REGION = 'us-west-2'
-  const MODEL_ID = 'anthropic.claude-3-opus-20240229-v1:0'
+  const REGION = 'us-east-1'
+  const MODEL_ID = 'anthropic.claude-3-5-sonnet-20240620-v1:0'
   const MODEL_ARGS = {
     max_tokens: 2000,
     anthropic_version: 'bedrock-2023-05-31',

diff --git a/services/apps/merge_suggestions_worker/src/workflows/mergeOrganizationsWithLLM.ts b/services/apps/merge_suggestions_worker/src/workflows/mergeOrganizationsWithLLM.ts
@@ -22,8 +22,8 @@ export async function mergeOrganizationsWithLLM(
   args: IProcessMergeOrganizationSuggestionsWithLLM,
 ): Promise<void> {
   const SUGGESTIONS_PER_RUN = 5
-  const REGION = 'us-west-2'
-  const MODEL_ID = 'anthropic.claude-3-opus-20240229-v1:0'
+  const REGION = 'us-east-1'
+  const MODEL_ID = 'anthropic.claude-3-5-sonnet-20240620-v1:0'
   const MODEL_ARGS = {
     max_tokens: 2000,
     anthropic_version: 'bedrock-2023-05-31',