Merge branch 'fix/meme-staging' of github.com:valory-xyz/olas-operate…

…-app into feature/modius

frontend/client/types.ts

@@ -46,9 +46,17 @@ export type ChainData = {
   };
 };
 
+export type EnvVariableAttributes = {
+  name: string;
+  description: string;
+  value: string;
+  provision_type: EnvProvisionType;
+};
+
 export type MiddlewareServiceResponse = {
   service_config_id: string; // TODO: update with uuid once middleware integrated
   name: string;
+  description: string;
   hash: string;
   hash_history: {
     [block: string]: string;
@@ -63,13 +71,7 @@ export type MiddlewareServiceResponse = {
       chain_data: ChainData;
     };
   };
-};
-
-export type EnvVariableAttributes = {
-  name: string;
-  description: string;
-  value: string;
-  provision_type: EnvProvisionType;
+  env_variables: { [key: string]: EnvVariableAttributes };
 };
 
 export type ServiceTemplate = {

frontend/components/MainPage/header/AgentButton/AgentNotRunningButton.tsx

@@ -7,6 +7,7 @@ import { CHAIN_CONFIG } from '@/config/chains';
 import { MechType } from '@/config/mechs';
 import { STAKING_PROGRAMS } from '@/config/stakingPrograms';
 import { SERVICE_TEMPLATES } from '@/constants/serviceTemplates';
+import { AgentType } from '@/enums/Agent';
 import { Pages } from '@/enums/Pages';
 import { TokenSymbol } from '@/enums/Token';
 import {
@@ -240,6 +241,25 @@ const useServiceDeployment = () => {
       }
     }
 
+    // Temporary: update the service if it has the default description
+    if (
+      service &&
+      service.description ===
+        SERVICE_TEMPLATES.find(
+          (template) => template.agentType === AgentType.Memeooorr,
+        )?.description
+    ) {
+      const xUsername = service.env_variables?.TWIKIT_USERNAME?.value;
+      if (xUsername) {
+        await ServicesService.updateService({
+          serviceConfigId: service.service_config_id,
+          partialServiceTemplate: {
+            description: `Memeooorr @${xUsername}`,
+          },
+        });
+      }
+    }
+
     // Start the service
     try {
       const serviceToStart = service ?? middlewareServiceResponse;

frontend/constants/serviceTemplates.ts

@@ -166,7 +166,7 @@ export const SERVICE_TEMPLATES: ServiceTemplate[] = [
   {
     agentType: AgentType.Memeooorr,
     name: 'Memeooorr',
-    hash: 'bafybeigzqb77yjq2up5mzt72pj7vkq4xxhs2holy2susoicpyz6dz7ds4a',
+    hash: 'bafybeidkbylrtawgal322jsi7qvecbkk3havbvdsms7sabbeupabx2nhru',
     description: 'Memeooorr @twitter_handle', // should be overwritten with twitter username
     image:
       'https://gateway.autonolas.tech/ipfs/QmQYDGMg8m91QQkTWSSmANs5tZwKrmvUCawXZfXVVWQPcu',

operate/services/utils/memeooorr.py

@@ -21,6 +21,7 @@
 
 import asyncio
 import json
+import logging
 import time
 from pathlib import Path
 from typing import Optional
@@ -49,7 +50,12 @@ def await_for_cookies() -> dict:
 
 
 async def async_get_twitter_cookies(
-    username: str, email: str, password: str, cookies: str, cookies_path: Path
+    username: str,
+    email: str,
+    password: str,
+    cookies: str,
+    cookies_path: Path,
+    max_retries: int = 10,
 ) -> Optional[str]:
     """Verifies that the Twitter credentials are correct and get the cookies"""
 
@@ -70,8 +76,8 @@ async def async_get_twitter_cookies(
         if not valid_cookies and cookies_path.exists():
             print("Checking the cookies file")
             with open(cookies_path, "r", encoding="utf-8") as cookies_file:
-                cookies = json.load(cookies_file)
-                client.set_cookies(cookies)
+                cookies_json = json.load(cookies_file)
+                client.set_cookies(cookies_json)
 
             user = await client.user()
             print(f"User from cookies file: {user.screen_name}")
@@ -94,13 +100,30 @@ async def async_get_twitter_cookies(
         # cookies = await_for_cookies()  # noqa
         # client.set_cookies(cookies)  # noqa
 
+    except twikit.errors.NotFound as e:
+        logging.exception(e)
+        print("Error: Page not found. Sleeping for 10 seconds and retrying...")
+        await asyncio.sleep(10)
+        if max_retries == 0:
+            raise e
+        return await async_get_twitter_cookies(
+            username, email, password, cookies, cookies_path, max_retries - 1
+        )
+
     return json.dumps(client.get_cookies()).replace(" ", "")
 
 
 def get_twitter_cookies(
-    username: str, email: str, password: str, cookies: str, cookies_path: Path
+    username: str,
+    email: str,
+    password: str,
+    cookies: str,
+    cookies_path: Path,
+    max_retries: int = 10,
 ) -> Optional[str]:
     """get_twitter_cookies"""
     return asyncio.run(
-        async_get_twitter_cookies(username, email, password, cookies, cookies_path)
+        async_get_twitter_cookies(
+            username, email, password, cookies, cookies_path, max_retries
+        )
     )

package.json

@@ -73,7 +73,7 @@
     "start:frontend": "cd frontend && yarn start",
     "test:frontend": "cd frontend && yarn test"
   },
-  "version": "0.2.0-rc58",
+  "version": "0.2.0-rc62",
   "engine": {
     "node": ">=20",
     "yarn": ">=1.22.0",

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "olas-operate-middleware"
-version = "0.2.0-rc58"
+version = "0.2.0-rc62"
 description = ""
 authors = ["David Vilela <[email protected]>", "Viraj Patel <[email protected]>"]
 readme = "README.md"

templates/memeooorr.yaml

@@ -1,6 +1,6 @@
 name: "Memeooorr"
 description: "Memeooorr @twitter_handle"
-hash: bafybeigzqb77yjq2up5mzt72pj7vkq4xxhs2holy2susoicpyz6dz7ds4a
+hash: bafybeidkbylrtawgal322jsi7qvecbkk3havbvdsms7sabbeupabx2nhru
 image: https://gateway.autonolas.tech/ipfs/QmQYDGMg8m91QQkTWSSmANs5tZwKrmvUCawXZfXVVWQPcu
 service_version: v0.2.0-alpha16
 home_chain: "base"