From 0f3174c6b59c10f8ad9f85fb2b8e360a28c9bae7 Mon Sep 17 00:00:00 2001
From: Shuchang Zheng <shu@skyvern.com>
Date: Tue, 17 Dec 2024 20:06:58 +0000
Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'skyvern/'?=
 =?UTF-8?q?=20with=20remote=20'skyvern/'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!-- ELLIPSIS_HIDDEN -->

> [!IMPORTANT]
> Rename dropdown items in `PromptBox.tsx` to `Skyvern 2.0 (Observer)` and `Skyvern 1.0 (Tasks)`.
>
>   - **UI Change**:
>     - In `PromptBox.tsx`, rename dropdown item from `Observer` to `Skyvern 2.0 (Observer)` for `CustomSelectItem` with value `v2`.
>     - Rename dropdown item from `Task` to `Skyvern 1.0 (Tasks)` for `CustomSelectItem` with value `v1`.
>
> <sup>This description was created by </sup>[<img alt="Ellipsis" src="https://img.shields.io/badge/Ellipsis-blue?color=175173">](https://www.ellipsis.dev?ref=Skyvern-AI%2Fskyvern-cloud&utm_source=github&utm_medium=referral)<sup> for 02fe03a005aa95a80d60dcbf3d380e8607df7690. It will automatically update as commits are pushed.</sup>

<!-- ELLIPSIS_HIDDEN -->
---
 skyvern/forge/sdk/db/id.py     |  6 ------
 skyvern/forge/sdk/db/models.py | 13 -------------
 2 files changed, 19 deletions(-)

diff --git a/skyvern/forge/sdk/db/id.py b/skyvern/forge/sdk/db/id.py
index cd3af9763..a27242ab4 100644
--- a/skyvern/forge/sdk/db/id.py
+++ b/skyvern/forge/sdk/db/id.py
@@ -46,7 +46,6 @@
 TASK_GENERATION_PREFIX = "tg"
 OBSERVER_CRUISE_ID = "oc"
 OBSERVER_THOUGHT_ID = "ot"
-PERSISTENT_BROWSER_SESSION_ID = "pbs"
 
 
 def generate_workflow_id() -> str:
@@ -154,11 +153,6 @@ def generate_observer_thought_id() -> str:
     return f"{OBSERVER_THOUGHT_ID}_{int_id}"
 
 
-def generate_persistent_browser_session_id() -> str:
-    int_id = generate_id()
-    return f"{PERSISTENT_BROWSER_SESSION_ID}_{int_id}"
-
-
 def generate_id() -> int:
     """
     generate a 64-bit int ID
diff --git a/skyvern/forge/sdk/db/models.py b/skyvern/forge/sdk/db/models.py
index 6c8ad80f5..444fba97a 100644
--- a/skyvern/forge/sdk/db/models.py
+++ b/skyvern/forge/sdk/db/models.py
@@ -30,7 +30,6 @@
     generate_org_id,
     generate_organization_auth_token_id,
     generate_output_parameter_id,
-    generate_persistent_browser_session_id,
     generate_step_id,
     generate_task_generation_id,
     generate_task_id,
@@ -541,15 +540,3 @@ class ObserverThoughtModel(Base):
 
     created_at = Column(DateTime, default=datetime.datetime.utcnow, nullable=False)
     modified_at = Column(DateTime, default=datetime.datetime.utcnow, onupdate=datetime.datetime.utcnow, nullable=False)
-
-
-class PersistentBrowserSessionModel(Base):
-    __tablename__ = "persistent_browser_sessions"
-
-    persistent_browser_session_id = Column(String, primary_key=True, default=generate_persistent_browser_session_id)
-    organization_id = Column(String, ForeignKey("organizations.organization_id"), nullable=False)
-    runnable_type = Column(String, nullable=False)
-    runnable_id = Column(String, nullable=False)
-    created_at = Column(DateTime, default=datetime.datetime.utcnow, nullable=False)
-    modified_at = Column(DateTime, default=datetime.datetime.utcnow, onupdate=datetime.datetime.utcnow, nullable=False)
-    deleted_at = Column(DateTime, nullable=True)

From 8210d4522c281985595768d7a6b7977d99b72955 Mon Sep 17 00:00:00 2001
From: Shuchang Zheng <shu@skyvern.com>
Date: Tue, 17 Dec 2024 20:06:58 +0000
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'skyvern-fr?=
 =?UTF-8?q?ontend/src/'=20with=20remote=20'skyvern-frontend/src/'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!-- ELLIPSIS_HIDDEN -->

> [!IMPORTANT]
> Rename dropdown items in `PromptBox.tsx` to `Skyvern 2.0 (Observer)` and `Skyvern 1.0 (Tasks)`.
>
>   - **UI Change**:
>     - In `PromptBox.tsx`, rename dropdown item from `Observer` to `Skyvern 2.0 (Observer)` for `CustomSelectItem` with value `v2`.
>     - Rename dropdown item from `Task` to `Skyvern 1.0 (Tasks)` for `CustomSelectItem` with value `v1`.
>
> <sup>This description was created by </sup>[<img alt="Ellipsis" src="https://img.shields.io/badge/Ellipsis-blue?color=175173">](https://www.ellipsis.dev?ref=Skyvern-AI%2Fskyvern-cloud&utm_source=github&utm_medium=referral)<sup> for 02fe03a005aa95a80d60dcbf3d380e8607df7690. It will automatically update as commits are pushed.</sup>

<!-- ELLIPSIS_HIDDEN -->
---
 skyvern-frontend/src/routes/tasks/create/PromptBox.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/skyvern-frontend/src/routes/tasks/create/PromptBox.tsx b/skyvern-frontend/src/routes/tasks/create/PromptBox.tsx
index 1a538cb1f..f66b31279 100644
--- a/skyvern-frontend/src/routes/tasks/create/PromptBox.tsx
+++ b/skyvern-frontend/src/routes/tasks/create/PromptBox.tsx
@@ -237,14 +237,14 @@ function PromptBox() {
             />
             {observerFeatureEnabled && (
               <Select value={selectValue} onValueChange={setSelectValue}>
-                <SelectTrigger className="w-32 focus:ring-0">
+                <SelectTrigger className="w-48 focus:ring-0">
                   <SelectValue />
                 </SelectTrigger>
                 <SelectContent className="border-slate-500 bg-slate-elevation3">
                   <CustomSelectItem value="v2" className="hover:bg-slate-800">
                     <div className="space-y-2">
                       <div>
-                        <SelectItemText>Observer</SelectItemText>
+                        <SelectItemText>Skyvern 2.0 (Observer)</SelectItemText>
                       </div>
                       <div className="text-xs text-slate-400">
                         best for complex tasks
@@ -254,7 +254,7 @@ function PromptBox() {
                   <CustomSelectItem value="v1">
                     <div className="space-y-2">
                       <div>
-                        <SelectItemText>Task</SelectItemText>
+                        <SelectItemText>Skyvern 1.0 (Tasks)</SelectItemText>
                       </div>
                       <div className="text-xs text-slate-400">
                         best for simple tasks

From 389446c4005730cb8478a6299e2dedbd35d79a1c Mon Sep 17 00:00:00 2001
From: Muhammed Salih Altun <muhammedsalihaltun@gmail.com>
Date: Tue, 17 Dec 2024 23:10:53 +0300
Subject: [PATCH 3/3] remove unrelated sync changes

---
 skyvern/forge/sdk/db/id.py     |  6 ++++++
 skyvern/forge/sdk/db/models.py | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/skyvern/forge/sdk/db/id.py b/skyvern/forge/sdk/db/id.py
index a27242ab4..cd3af9763 100644
--- a/skyvern/forge/sdk/db/id.py
+++ b/skyvern/forge/sdk/db/id.py
@@ -46,6 +46,7 @@
 TASK_GENERATION_PREFIX = "tg"
 OBSERVER_CRUISE_ID = "oc"
 OBSERVER_THOUGHT_ID = "ot"
+PERSISTENT_BROWSER_SESSION_ID = "pbs"
 
 
 def generate_workflow_id() -> str:
@@ -153,6 +154,11 @@ def generate_observer_thought_id() -> str:
     return f"{OBSERVER_THOUGHT_ID}_{int_id}"
 
 
+def generate_persistent_browser_session_id() -> str:
+    int_id = generate_id()
+    return f"{PERSISTENT_BROWSER_SESSION_ID}_{int_id}"
+
+
 def generate_id() -> int:
     """
     generate a 64-bit int ID
diff --git a/skyvern/forge/sdk/db/models.py b/skyvern/forge/sdk/db/models.py
index 444fba97a..6c8ad80f5 100644
--- a/skyvern/forge/sdk/db/models.py
+++ b/skyvern/forge/sdk/db/models.py
@@ -30,6 +30,7 @@
     generate_org_id,
     generate_organization_auth_token_id,
     generate_output_parameter_id,
+    generate_persistent_browser_session_id,
     generate_step_id,
     generate_task_generation_id,
     generate_task_id,
@@ -540,3 +541,15 @@ class ObserverThoughtModel(Base):
 
     created_at = Column(DateTime, default=datetime.datetime.utcnow, nullable=False)
     modified_at = Column(DateTime, default=datetime.datetime.utcnow, onupdate=datetime.datetime.utcnow, nullable=False)
+
+
+class PersistentBrowserSessionModel(Base):
+    __tablename__ = "persistent_browser_sessions"
+
+    persistent_browser_session_id = Column(String, primary_key=True, default=generate_persistent_browser_session_id)
+    organization_id = Column(String, ForeignKey("organizations.organization_id"), nullable=False)
+    runnable_type = Column(String, nullable=False)
+    runnable_id = Column(String, nullable=False)
+    created_at = Column(DateTime, default=datetime.datetime.utcnow, nullable=False)
+    modified_at = Column(DateTime, default=datetime.datetime.utcnow, onupdate=datetime.datetime.utcnow, nullable=False)
+    deleted_at = Column(DateTime, nullable=True)