Merge pull request #485 from classtranscribe/staging

Push to production
classtranscribe · Aug 21, 2024 · 7074f0a · 7074f0a
2 parents 2051f8c + 43f3ad3
commit 7074f0a
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 18 deletions.
diff --git a/API.Dockerfile b/API.Dockerfile
@@ -28,6 +28,7 @@ WORKDIR /src
 COPY ./ClassTranscribeDatabase/ClassTranscribeDatabase.csproj ./ClassTranscribeDatabase/ClassTranscribeDatabase.csproj
 # Did not help ENV DOTNET_NUGET_SIGNATURE_VERIFICATION=false
 # Add --verbosity normal|diagnostic
+RUN dotnet  --list-sdks 
 RUN dotnet restore --verbosity diagnostic  ./ClassTranscribeDatabase/ClassTranscribeDatabase.csproj
 
 COPY ./ClassTranscribeServer/ClassTranscribeServer.csproj ./ClassTranscribeServer/ClassTranscribeServer.csproj

diff --git a/ClassTranscribeDatabase/global.json b/ClassTranscribeDatabase/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.1.201"
+    "version": "8.0.201"
   }
 }
diff --git a/ClassTranscribeServer/global.json b/ClassTranscribeServer/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100-1"
+    "version": "8.0.401"
   }
 }
diff --git a/PythonRpcServer/kaltura.py b/PythonRpcServer/kaltura.py
@@ -97,7 +97,7 @@ def getClient(self, partnerId, tokenId, appToken):
         # generate token hash from ks + appToken
         tokenHash = hashlib.sha256(result.ks.encode('ascii')+appToken.encode('ascii')).hexdigest()
         # start an app token session
-        result = client.appToken.startSession( tokenId, tokenHash, '', '', expiry)
+        result = client.appToken.startSession( tokenId, tokenHash, '', KalturaSessionType.ADMIN, expiry)
         client.setKs(result.ks)
         return client,result.ks
     # Returns dict of Media information for a specific media

diff --git a/PythonRpcServer/requirements.txt b/PythonRpcServer/requirements.txt
@@ -7,27 +7,27 @@
 protobuf==4.25.2 
 
 #Floowing Updated to latest 2024-1-17:
-certifi==2023.11.17
+certifi==2024.7.4
 backcall==0.2.0
 chardet==5.2.0
 click==8.1.7
 decorator==5.1.1
 ffmpy==0.3.1
 grpcio==1.60.0
 grpcio-tools==1.60.0
-idna==3.6
+idna==3.7
 KalturaApiClient==19.3.0
 lxml==5.1.0
 parso==0.8.3
 pexpect==4.9.0
 pickleshare==0.7.5
 ptyprocess==0.7.0
-requests==2.31.0
+requests==2.32.2
 requests-toolbelt==1.0.0
 six==1.16.0
-tqdm==4.66.1
+tqdm==4.66.3
 traitlets==4.3.3
-urllib3==2.1.0
+urllib3==2.2.2
 wcwidth==0.2.13
 
 # Not versioned

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 This repository provides the source code primary API endpoint of the ClassTranscribe Server. Copyright (C) University of Illinois, USA. 2019-2022
 
-The source code in this repository is licensed here under the GNU Public License 3.0 (https://www.gnu.org/licenses/gpl-3.0.en.html). Please email angrave at Illinois if you are interested in alternative licenses of this code and related intellectual property.
+The source code in this repository is licensed [here](https://github.com/classtranscribe/WebAPI/blob/staging/LICENSE). Please email angrave at Illinois if you are interested in alternative licenses of this code and related intellectual property.
 
 ## Build Status
 

diff --git a/TaskEngine/global.json b/TaskEngine/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100-1"
+    "version": "8.0.401"
   }
 }
diff --git a/install-speech-hack-libssl1.sh b/install-speech-hack-libssl1.sh
@@ -3,18 +3,21 @@
 # Temporary 2024 Hack for MS SpeechSDK to run on dotnet8
 # https://github.com/Azure-Samples/cognitive-services-speech-sdk/issues/2204
 
-ARCH=$(dpkg --print-architecture)
+SSLVERSION="1.1.1f"
 
+ARCH=$(dpkg --print-architecture)
 if [ "$ARCH" = "arm64" ] ; then
-    BASE="http://ports.ubuntu.com/ubuntu-ports/pool/main/o/openssl/"
+    BASE="http://ports.ubuntu.com/pool/main/o/openssl"
+    RELEASE="1ubuntu2"
 else
-    BASE="http://security.ubuntu.com/ubuntu/pool/main/o/openssl/"
+    BASE="http://security.ubuntu.com/ubuntu/pool/main/o/openssl"
+    RELEASE="1ubuntu2"
 fi
 
-wget $BASE/libssl1.1_1.1.1f-1ubuntu2.20_${ARCH}.deb
-wget $BASE/libssl-dev_1.1.1f-1ubuntu2.20_${ARCH}.deb 
-dpkg -i libssl1.1_1.1.1f-1ubuntu2.20_${ARCH}.deb 
-dpkg -i libssl-dev_1.1.1f-1ubuntu2.20_${ARCH}.deb
-rm libssl1.1_1.1.1f-1ubuntu2.20_${ARCH}.deb libssl-dev_1.1.1f-1ubuntu2.20_${ARCH}.deb
+wget ${BASE}/libssl1.1_${SSLVERSION}-${RELEASE}_${ARCH}.deb
+wget ${BASE}/libssl-dev_${SSLVERSION}-${RELEASE}_${ARCH}.deb 
+dpkg -i libssl1.1_${SSLVERSION}-${RELEASE}_${ARCH}.deb 
+dpkg -i libssl-dev_${SSLVERSION}-${RELEASE}_${ARCH}.deb
+rm libssl1.1_${SSLVERSION}-${RELEASE}_${ARCH}.deb libssl-dev_${SSLVERSION}-${RELEASE}_${ARCH}.deb