Skip to content

Commit ae7d6d0

Browse files
committed
Merge branch 'dev' of github.com:TeamOpenSmartGlasses/DiscussPlusPlus into dev
2 parents bc11ba6 + 48f8d51 commit ae7d6d0

File tree

5 files changed

+72
-19
lines changed

5 files changed

+72
-19
lines changed

.github/workflows/porter-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- name: Deploy stack to Dev
2323
timeout-minutes: 30
24-
run: exec porter apply -f ./augmentos_cloud/porter.yaml
24+
run: exec porter apply -f ./augmentos_cloud/porter-dev.yaml
2525
env:
2626
PORTER_APP_NAME: cloud-dev
2727
PORTER_NAMESPACE: dev
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
"on":
2+
push:
3+
branches:
4+
- dev
5+
name: Deploy to cloud-dev
6+
jobs:
7+
porter-deploy:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout code
11+
uses: actions/checkout@v4
12+
- name: Set Github tag
13+
id: vars
14+
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
15+
- name: Setup porter
16+
uses: porter-dev/[email protected]
17+
- name: Deploy stack
18+
timeout-minutes: 30
19+
run: exec porter apply -f ./augmentos_cloud/porter.yaml
20+
env:
21+
PORTER_APP_NAME: cloud-dev
22+
PORTER_CLUSTER: "4965"
23+
PORTER_DEPLOYMENT_TARGET_ID: 540690ee-b1d7-4a5e-80e9-683d11001c75
24+
PORTER_HOST: https://dashboard.porter.run
25+
PORTER_PR_NUMBER: ${{ github.event.number }}
26+
PORTER_PROJECT: "15081"
27+
PORTER_REPO_NAME: ${{ github.event.repository.name }}
28+
PORTER_TAG: ${{ steps.vars.outputs.sha_short }}
29+
PORTER_TOKEN: ${{ secrets.PORTER_APP_15081_4965 }}

augmentos_cloud/packages/cloud/src/services/processing/transcription.service.ts

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,25 +1257,26 @@ export class TranscriptionService {
12571257
* Get maximum retry attempts based on error type
12581258
*/
12591259
private getMaxRetries(errorCode: number, errorDetails?: string): number {
1260-
switch (errorCode) {
1261-
case 7: // Race condition errors - reduce from 5 to 3 attempts
1262-
return 3;
1260+
return 10; // Default generous retry count.
1261+
// switch (errorCode) {
1262+
// case 7: // Race condition errors - NOT RETRYABLE (infinite loop prevention)
1263+
// return 0; // This should never be called since Error Code 7 is not retryable
12631264

1264-
case 4: // Network issues
1265-
if (errorDetails && errorDetails.includes('4429')) {
1266-
// Rate limiting - fewer retries with longer delays
1267-
return 3;
1268-
}
1269-
// Other network issues - moderate retries
1270-
return 3;
1265+
// case 4: // Network issues
1266+
// if (errorDetails && errorDetails.includes('4429')) {
1267+
// // Rate limiting - fewer retries with much longer delays
1268+
// return 5;
1269+
// }
1270+
// // Other network issues - generous retries for transient issues
1271+
// return 10;
12711272

1272-
case 6: // Timeout issues - moderate retries
1273-
return 3;
1274-
case 999: // Start failures - limited retries
1275-
return 2;
1276-
default:
1277-
return 1;
1278-
}
1273+
// case 6: // Timeout issues - generous retries
1274+
// return 10;
1275+
// case 999: // Start failures - moderate retries
1276+
// return 5;
1277+
// default:
1278+
// return 3; // More generous default
1279+
// }
12791280
}
12801281

12811282
/**

augmentos_cloud/porter-dev.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
version: v2
2+
# Omit a hard-coded name here. Use environment variables to supply dynamic values.
3+
namespace: ${PORTER_NAMESPACE}
4+
5+
# envGroups:
6+
# - dev
7+
8+
build:
9+
method: docker
10+
context: ./augmentos_cloud/.
11+
dockerfile: ./augmentos_cloud/docker/Dockerfile.porter
12+
13+
services:
14+
- name: cloud
15+
type: web
16+
run: node packages/cloud/dist/index.js
17+
port: 80
18+
cpuCores: 2.9
19+
ramMegabytes: 4096
20+
env:
21+
HOST: "0.0.0.0"
22+
SERVICE_NAME: "cloud"

augmentos_cloud/store/web/public/.well-known/assetlinks.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"package_name": "com.mentra.mentra",
99
"sha256_cert_fingerprints": [
1010
"B9:5C:D9:5F:D9:1D:BE:60:2C:99:64:FE:D0:7C:C0:1C:EE:A1:A6:8C:9B:B3:FB:03:AB:BB:E8:34:3B:31:69:FC",
11-
"FA:C6:17:45:DC:09:03:78:6F:B9:ED:E6:2A:96:2B:39:9F:73:48:F0:BB:6F:89:9B:83:32:66:75:91:03:3B:9C"
11+
"FA:C6:17:45:DC:09:03:78:6F:B9:ED:E6:2A:96:2B:39:9F:73:48:F0:BB:6F:89:9B:83:32:66:75:91:03:3B:9C",
12+
"C8:7C:50:1C:C6:0E:14:C9:26:CD:51:B9:67:9F:73:E3:5E:D6:A9:AC:5E:98:9F:BC:8F:87:23:5B:25:64:18:C1"
1213
]
1314
}
1415
}

0 commit comments

Comments
 (0)