Upgrade hypha-rpc; publish helm-charts

.github/workflows/test-helm-chart.yml

@@ -1,4 +1,4 @@
-name: Test Hypha Helm Chart
+name: Test and Publish Hypha Helm Chart
 
 on:
   push:
@@ -13,7 +13,7 @@ on:
       - 'hypha/VERSION'
 
 jobs:
-  test:
+  build:
     runs-on: ubuntu-latest
 
     steps:
@@ -33,30 +33,18 @@ jobs:
     - name: Create hypha namespace
       run: kubectl create namespace hypha
 
-    - name: Copy .env-template to .env
-      run: cp helm-chart/.env-template helm-chart/.env
-
-    - name: Apply secrets
+    - name: Package Helm chart
       run: |
-        cd helm-chart
-        chmod +x apply-secrets.sh
-        ./apply-secrets.sh
-
-    - name: Install Hypha Helm chart
-      run: helm install hypha-server ./helm-chart/hypha-server --namespace=hypha
+        cd helm-charts
+        helm package hypha-server
+        helm repo index . --url https://amun-ai.github.io/hypha/helm-charts
 
-    # Skip the test for now
-    # - name: Wait for pods to be ready
-    #   run: |
-    #     kubectl wait --namespace=hypha \
-    #       --for=condition=ready pod \
-    #       --selector=app=hypha-server \
-    #       --timeout=300s
-
-    # - name: Test the webpage at /
-    #   run: |
-    #     SERVICE_IP=$(kubectl get svc hypha-server --namespace=hypha -o jsonpath='{.spec.clusterIP}')
-    #     curl -f http://$SERVICE_IP:9520/
+    - name: Publish to gh-pages
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: ./helm-charts
+        publish_branch: gh-pages
 
     - name: Uninstall Hypha Helm chart
       run: helm uninstall hypha-server --namespace=hypha

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Hypha Change Log
 
+### 0.20.35
+
+ - Upgrade hypha-rpc to fix reset timer
+
 ### 0.20.34
 
  - Fix persistent workspace unloaded issue when s3 is not available.

docs/hypha_data_store.py

@@ -26,7 +26,7 @@ async def setup(self, server, service_id="data-store", visibility="public"):
     def get_url(self, obj_id: str):
         assert self._svc, "Service not initialized, call `setup()`"
         assert obj_id in self.storage, "Object not found " + obj_id
-        return f"{self._server.config.public_base_url}/{self._server.config.workspace}/apps/{self._svc.id.split(':')[1]}/get?id={obj_id}"
+        return f"{self._server.config.public_base_url}/{self._server.config.workspace}/apps/{self._svc.id.split('/')[1]}/get?id={obj_id}"
 
     def put(self, obj_type: str, value: any, name: str, comment: str = ""):
         assert self._svc, "Please call `setup()` before using the store"

hypha/VERSION

@@ -1,3 +1,3 @@
 {
-    "version": "0.20.34"
+    "version": "0.20.35.pre1"
 }

hypha/__init__.py

@@ -9,10 +9,6 @@
 __version__ = VERSION_INFO["version"]
 parts = __version__.split(".")
 main_version = f"{parts[0]}.{parts[1]}.{parts[2]}"
-if len(parts) > 3:
-    # if the version is not a release version, we need to use the previous version
-    if not parts[3].startswith("post"):
-        main_version = f"{parts[0]}.{parts[1]}.{int(parts[2])-1}"
 
 
 __all__ = ["__version__", "main_version"]