wip

Author: rozen03

.github/workflows/google-cloudrun-docker.yml

@@ -59,14 +59,17 @@ jobs:
         with:
           credentials_json: ${{ secrets.GCP_SA_KEY }}
 
-
       - name: Set up Cloud SDK
         uses: 'google-github-actions/setup-gcloud@v2'
 
       - name: Define image tag for deployment
         id: image_tag
         run: echo "TAG=${{ env.PROJECT_REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.ARTIFACT_REGISTRY }}/${{ env.SERVICE_NAME }}:${{ github.sha }}" >> $GITHUB_ENV
 
+      - name: Get existing service URL
+        id: get_url
+        run: echo "URL=$(gcloud run services describe ${{ env.SERVICE_NAME }} --platform managed --region ${{ env.PROJECT_REGION }} --format 'value(status.url)')" >> $GITHUB_ENV
+
       - name: Deploy to Cloud Run
         run: |-
           gcloud run deploy ${{ env.SERVICE_NAME }} \
@@ -83,15 +86,6 @@ jobs:
             --set-secrets=S3_ACCESS_SECRET=${{ vars.GCP_SECRET_S3_ACCESS_SECRET }}:latest \
             --set-secrets=S3_HOST=${{ vars.GCP_SECRET_S3_HOST }}:latest \
             --set-env-vars=S3_BUCKET=${{ vars.GCP_S3_BUCKET }} \
+            --update-env-vars=WEBHOOK_URL=${{ env.URL }} \
             --platform managed \
             --allow-unauthenticated
-
-      - name: Get service URL
-        id: service_url
-        run: echo "URL=$(gcloud run services describe ${{ env.SERVICE_NAME }} --platform managed --region ${{ env.PROJECT_REGION }} --format 'value(status.url)')" >> $GITHUB_ENV
-
-      - name: Set webhook URL environment variable
-        run: |-
-          gcloud run services update ${{ env.SERVICE_NAME }} \
-            --region ${{ env.PROJECT_REGION }} \
-            --update-env-vars=WEBHOOK_URL=${{ env.URL }}

main.py

@@ -16,21 +16,15 @@ def main():
     # Initialize the database
     init_db()
 
-    # Get webhook URL from environment.
-    webhook_url_from_env = os.environ.get("WEBHOOK_URL")
+    # The WEBHOOK_URL is now guaranteed to be set by the CI/CD pipeline.
+    webhook_url = os.environ["WEBHOOK_URL"]
 
-    # Prepare the webhook_url parameter. It must be None if the env var is missing or empty.
-    webhook_url_param = None
-    if webhook_url_from_env: # This is only true if the string is not None and not empty.
-        webhook_url_param = f'{webhook_url_from_env}/{os.environ["TELEGRAM_BOT_TOKEN"]}'
-
     # Start the Bot
-    # If webhook_url_param is None, run_webhook will only start the webserver without setting a webhook.
     application.run_webhook(
         listen="0.0.0.0",
         port=int(os.environ.get("PORT", 8080)),
-        #url_path=os.environ["TELEGRAM_BOT_TOKEN"],
-        #webhook_url=webhook_url_param,
+        url_path=os.environ["TELEGRAM_BOT_TOKEN"],
+        webhook_url=f'{webhook_url.rstrip("/")}/{os.environ["TELEGRAM_BOT_TOKEN"]}',
     )
 
 if __name__ == "__main__":

utils/hora_feliz_dia.py

@@ -6,14 +6,6 @@
 
 import pytz
 
-
-def get_hora_feliz_dia():
-    tz = pytz.timezone("America/Argentina/Buenos_Aires")
-    now = datetime.datetime.now(tz).date()
-    midnight = tz.localize(datetime.datetime.combine(now, datetime.time(0, 0, 3)), is_dst=None)
-    return midnight.astimezone(pytz.utc).time()
-
-
 def get_hora_update_groups():
     tz = pytz.timezone("America/Argentina/Buenos_Aires")
     now = datetime.datetime.now(tz).date()