Merge pull request #19 from LoopMind-AI/user_auth

Add local and cloud selections

.gitignore

@@ -49,4 +49,7 @@ coverage.xml
 # Sphinx documentation
 docs/_build/
 
-.ipynb_checkpoints/
+.ipynb_checkpoints/
+
+# Added by LoopQuest
+.env

README.md

@@ -1,12 +1,17 @@
 # :scroll:Loopquest
 
-A Production Tool for Embodied AI. 
+[![Downloads](https://static.pepy.tech/badge/loopquest)](https://pepy.tech/project/loopquest)
+[![Downloads](https://static.pepy.tech/badge/loopquest/month)](https://pepy.tech/project/loopquest)
+[![Downloads](https://static.pepy.tech/badge/loopquest/week)](https://pepy.tech/project/loopquest)
+
+A Production Tool for Embodied AI.
 ![loopquest frontend](screenshots/loopquest-screenshot.png)
 
 - :video_camera:[Tutorial Video - Updated 9/4/2023](https://capture.dropbox.com/UXKQxGkwel6VRZJQ), [Dataset Demo](https://capture.dropbox.com/AOF5rGxHWyRb9T58)
 - :house:[Discord](https://discord.gg/FTnFYeSy9r)
 
 # Major features
+
 - Imitation Learning / Offline Reinforcement Learning Oriented MLOps. Log all the observation, action, reward, rendered images into database with only ONE extra line of code.
 
 ```python
@@ -16,11 +21,12 @@ env = gymnasium.make("MountainCarContinuous-v0", render_mode="rgb_array")
 ->
 
 ```python
-from loopquest.gym_wrappers import LoopquestGymWrapper
-env = LoopquestGymWrapper(
-    gymnasium.make("MountainCarContinuous-v0", render_mode="rgb_array"), "my_experiment"
+import loopquest
+env = loopquest.make_env(
+    gymnasium.make("MountainCarContinuous-v0", render_mode="rgb_array")
 )
 ```
+
 - Directly trainable data for robotics foundation model. Select and download the (observation, action, reward) data with the dataloader interfaces of the most popular deep learning frameworks (e.g. tensorflow, pytorch, huggingface dataset apis). Check [Dataset Quickstart Example](examples/Dataset%20Quickstart.ipynb) for more details.
 
 ```python
@@ -55,7 +61,9 @@ The data schema will look like
     'images': [<PIL.JpegImagePlugin.JpegImageFile image mode=RGB size=600x400 at 0x7F8D33094450>]
 }
 ```
+
 - All the regular MLOps features are included, e.g. data visualization, simulation rendering, experiment management.
+
 # Installation
 
 For stable version, run
@@ -77,21 +85,15 @@ cd loopquest
 pip install -e .
 ```
 
-# How to run
+# Usage
 
-At `loopquest` folder, bring up web-app,
-
-```sh
-docker compose up --build
-```
-
-Then run quickstart script,
+Run [quickstart script](examples/quickstart.py),
 
 ```sh
 python examples/quickstart.py
 ```
 
-The command prompt should mention "Check your experiment progress on `http://localhost:5667/experiment/<exp_id>`".
+The command prompt will ask you to select local or cloud instance. Pick the instance you want and once the script is up and running. You should see "Check your experiment progress on `http://localhost:5667/experiment/<exp_id>` or `https://open.loopquest.ai/experiment/<exp_id`" (depending on the instance you selected).
 
 **Loopquest Developer Only**: to bring up a development server that reflects your local changes in real time, run
 
@@ -103,12 +105,10 @@ bash start_dev_server.sh
 
 ```python
 import gymnasium
-from loopquest.gym_wrappers import LoopquestGymWrapper
+import loopquest
 
-experiment_name = "test"
-env = LoopquestGymWrapper(
-    gymnasium.make("MountainCarContinuous-v0", render_mode="rgb_array"),
-    experiment_name,
+env = loopquest.make_env(
+    gymnasium.make("MountainCarContinuous-v0", render_mode="rgb_array")
 )
 obs, info = env.reset()
 for i in range(100):
@@ -118,4 +118,5 @@ for i in range(100):
     if terminated or truncated:
         break
 env.close()
+
 ```

backend/src/apps/experiment/routers.py

@@ -14,7 +14,7 @@
 )
 
 
-@api_router.post("/", response_model=schema.Experiment)
+@api_router.post("", response_model=schema.Experiment)
 async def create_experiment(request: Request, experiment: schema.ExperimentCreate):
     while True:
         try:

docker-compose-dev.yml

@@ -12,7 +12,9 @@ services:
       - BACKEND_URL=http://backend:8000
     volumes:
       - ./frontend:/frontend
-      - /frontend/node_modules
+      - ./frontend/package.json:/frontend/package.json
+      - ./frontend/package-lock.json:/frontend/package-lock.json
+      - node_modules:/frontend/node_modules
     depends_on:
       - backend
 
@@ -51,3 +53,4 @@ services:
 volumes:
   db:
   media_store:
+  node_modules:

docker-compose.yml

@@ -1,10 +1,7 @@
 services:
   frontend:
     container_name: loopquest-frontend
-    image: loopquest-frontend
-    build:
-      context: .
-      dockerfile: Dockerfile.frontend
+    image: jinyuloopmind/loopquest-frontend:prod
     ports:
       # FUN FACT: The port 5667 means "LOOP" on the dial pad.
       - "5667:3000"
@@ -15,10 +12,7 @@ services:
 
   backend:
     container_name: loopquest-backend
-    image: loopquest-backend
-    build:
-      context: .
-      dockerfile: Dockerfile.backend
+    image: jinyuloopmind/loopquest-backend:prod
     environment:
       # NOTE: This URL is the one exposed by the frontend container.
       - APP_URL=http://localhost:5667

docker_release.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+TAG=prod
+# TAG=staging
+
+docker build -t loopquest-frontend:$TAG -f Dockerfile.frontend .
+docker tag loopquest-frontend:$TAG jinyuloopmind/loopquest-frontend:$TAG
+docker push jinyuloopmind/loopquest-frontend:$TAG
+
+docker build -t loopquest-backend:$TAG -f Dockerfile.backend .
+docker tag loopquest-backend:$TAG jinyuloopmind/loopquest-backend:$TAG
+docker push jinyuloopmind/loopquest-backend:$TAG

examples/quickstart.py

@@ -1,10 +1,8 @@
 import gymnasium
-from loopquest.gym_wrappers import LoopquestGymWrapper
+import loopquest
 
-experiment_name = "test"
-env = LoopquestGymWrapper(
-    gymnasium.make("MountainCarContinuous-v0", render_mode="rgb_array"),
-    experiment_name,
+env = loopquest.make_env(
+    gymnasium.make("MountainCarContinuous-v0", render_mode="rgb_array")
 )
 obs, info = env.reset()
 for i in range(100):

examples/run_simglucose.py

@@ -1,5 +1,5 @@
 import gymnasium
-from loopquest.gym_wrappers import LoopquestGymWrapper
+import loopquest
 from gymnasium.envs.registration import register
 
 register(
@@ -9,10 +9,7 @@
 )
 
 experiment_name = "a test"
-env = LoopquestGymWrapper(
-    gymnasium.make("simglucose/adolescent2-v0"),
-    experiment_name,
-)
+env = loopquest.make_env(gymnasium.make("simglucose/adolescent2-v0"))
 obs, info = env.reset()
 for i in range(100):
     action = env.action_space.sample()

frontend/src/components/line_chart.tsx

@@ -65,7 +65,6 @@ export default function LineChart({ line_data }: { line_data: VariableData }) {
     return {
       label: data.name,
       data: data.value,
-      fill: true,
       tension: 0.1,
       pointRadius: 0,
     };

frontend/src/components/navbar.tsx

@@ -21,10 +21,6 @@ export default function Navbar() {
           <li>
             <Link href="/datasets">Datasets</Link>
           </li>
-        </ul>
-      </div>
-      <div className="navbar-end">
-        <ul className="menu menu-horizontal px-1 text-lg">
           <li>
             <Link href="/about">About</Link>
           </li>

frontend/src/pages/_app.tsx

@@ -3,25 +3,10 @@ import Layout from "@/components/layout";
 import type { AppProps } from "next/app";
 import { config } from "@fortawesome/fontawesome-svg-core";
 import "@fortawesome/fontawesome-svg-core/styles.css";
-import { useRouter } from "next/router";
-import { useEffect } from "react";
-import * as gtag from "../../lib/gtag";
 
 config.autoAddCss = false;
-const isProduction = process.env.NODE_ENV === "production";
 
 const App = ({ Component, pageProps }: AppProps): JSX.Element => {
-  const router = useRouter();
-  useEffect(() => {
-    const handleRouteChange = (url: URL) => {
-      /* invoke analytics function only for production */
-      if (isProduction) gtag.pageview(url);
-    };
-    router.events.on("routeChangeComplete", handleRouteChange);
-    return () => {
-      router.events.off("routeChangeComplete", handleRouteChange);
-    };
-  }, [router.events]);
   return (
     <Layout>
       <Component {...pageProps} />

frontend/src/pages/_document.tsx

@@ -1,36 +1,9 @@
 import { Html, Head, Main, NextScript } from "next/document";
 
-import { GA_TRACKING_ID } from "../../lib/gtag";
-const isProduction = process.env.NODE_ENV === "production";
-
 export default function Document() {
-
   return (
     <Html lang="en">
-          <Head>
-          {/* enable analytics script only for production */}
-          {isProduction && (
-            <>
-              <script
-                async
-                src={`https://www.googletagmanager.com/gtag/js?id=${GA_TRACKING_ID}`}
-              />
-              <script
-                // eslint-disable-next-line react/no-danger
-                dangerouslySetInnerHTML={{
-                  __html: `
-            window.dataLayer = window.dataLayer || [];
-            function gtag(){dataLayer.push(arguments);}
-            gtag('js', new Date());
-            gtag('config', '${GA_TRACKING_ID}', {
-              page_path: window.location.pathname,
-            });
-          `,
-                }}
-              />
-            </>
-          )}
-        </Head>
+      <Head></Head>
       <link rel="icon" href="/favicon.svg" />
       <title>Close Loop on Cloud | LoopQuest</title>
       <body>

loopquest/__init__.py

@@ -0,0 +1 @@
+from loopquest.api import init, is_initialized, make_env, close