move simulators and update docs

inverted-ai · Oct 18, 2022 · c25fd7c · c25fd7c
1 parent 21cd047
commit c25fd7c
Show file tree

Hide file tree

Showing 20 changed files with 99 additions and 227 deletions.
diff --git a/docs/source/.modules/invertedai_carlasim.rst b/docs/source/.modules/invertedai_carlasim.rst
diff --git a/docs/source/.modules/invertedai_drive.rst b/docs/source/.modules/invertedai_drive.rst
diff --git a/docs/source/.modules/modules.rst b/docs/source/.modules/modules.rst
diff --git a/docs/source/carlasim.md b/docs/source/carlasim.md
@@ -1,11 +1,3 @@
 # CARLA Integration
 
 ## Carla Env
-
-```{eval-rst}
-.. automodule:: invertedai.simulators.carla_simulator
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-```
diff --git a/docs/source/getstarted/gs-drive.md b/docs/source/getstarted/gs-drive.md
@@ -4,7 +4,7 @@
 This model can drive all the agents with only the current state of the environment, i.e., one step observations (which could be obtained from **{ref}`INITIALIZE`**) or with multiple past observations.
 ```python
 response = iai.drive(
-    location="CARLA:Town03:Roundabout",
+    location="iai:ubc_roundabout",
     agent_attributes=response["attributes"],
     states=response["states"],
     recurrent_states=response["recurrent_states"],

diff --git a/docs/source/getstarted/gs-initialize.md b/docs/source/getstarted/gs-initialize.md
@@ -8,7 +8,7 @@ Inverted AI provides the {ref}`INITIALIZE`, a state-of-the-art model trained wit
 generates initial conditions (position and speed) for all the agents including the ego vehicle
 ```python
 response = iai.initialize(
-    location="CARLA:Town03:Roundabout",
+    location="iai:ubc_roundabout",
     agent_count=10,
 )
 ```

diff --git a/docs/source/getstarted/gs-mapinfo.md b/docs/source/getstarted/gs-mapinfo.md
@@ -2,22 +2,15 @@
 
 Inverted AI provides an assortment of diverse road configurations and geometries, including real-world locations and maps from simulators (CARLA, Huawei SMARTS, ...).
 
-## AVAILABLE-LOCATIONS
-To search the catalog for available maps to your account (API key) use **{ref}`AVAILABLE-LOCATIONS`** method by providing keywords
-```python
-iai.available_locations("roundabout", "carla")
-```
-
-## LOCATION_INFO
 To get information about a scene use **{ref}`LOCATION_INFO`**.
 ```python
-iai.location_info("CARLA:Town03:Roundabout")
+iai.location_info("iai:ubc_roundabout")
 ```
 The scene information include the map in [Lanelet2](https://github.com/fzi-forschungszentrum-informatik/Lanelet2) format, map in JPEG format, maximum number of allowed (driveable) vehicles, latitude longitude coordinates (for real-world locations), id and list of traffic light and signs (if any exist in the map), etc.
 
 
 ---
-{ref}`LOCATION_INFO`, {ref}`AVAILABLE-LOCATIONS`: more information about the python SDK.\
+{ref}`LOCATION_INFO`: more information about the python SDK.\
 {ref}`REST API`: more information about the REST API and other programming languages.
 
 

diff --git a/docs/source/getstarted/index.md b/docs/source/getstarted/index.md
@@ -21,19 +21,17 @@ iai.add_apikey("XXXXXXXXXXXXXX")
 Initialize the agents:
 ```python
 response = iai.initialize(
-    location="CARLA:Town03:Roundabout",
+    location="iai:ubc_roundabout",
     agent_count=10,
 )
 ```
 Drive the agents:
 ```python
 response = iai.drive(
-    location="CARLA:Town03:Roundabout",
-    agent_attributes=response["attributes"],
-    states=response["states"],
-    recurrent_states=response["recurrent_states"],
-    traffic_states_id=response["traffic_states_id"],
-    steps=1,
+    location="iai:ubc_roundabout",
+    agent_attributes=agent_attributes,
+    agent_states=response.agent_states,
+    recurrent_states=response.recurrent_states,
     get_birdviews=True,
     get_infractions=True,
 )

diff --git a/docs/source/pythonapi/index.md b/docs/source/pythonapi/index.md
@@ -6,7 +6,6 @@
 
 sdk-drive
 sdk-initialize
-sdk-available-locations
 sdk-location-info
 sdk-dataclasses
 ```

diff --git a/docs/source/pythonapi/sdk-available-locations.md b/docs/source/pythonapi/sdk-available-locations.md
diff --git a/examples/Demo_Drive.py b/examples/Demo_Drive.py
@@ -18,25 +18,23 @@
 
 parser = argparse.ArgumentParser(description="Simulation Parameters.")
 parser.add_argument("--api_key", type=str, default="")
-parser.add_argument("--location", type=str, default="CARLA:Town03:Roundabout")
+parser.add_argument("--location", type=str, default="iai:ubc_roundabout")
 args = parser.parse_args()
 
 iai.add_apikey("")
 
-response = iai.available_locations("carla", "roundabout")
 response = iai.location_info(location=args.location)
 
 file_name = args.location.replace(":", "_")
-if response.lanelet_map_source is not None:
+if response.osm_map is not None:
     file_path = f"{file_name}.osm"
     with open(file_path, "w") as f:
-        f.write(response.lanelet_map_source)
-if response.rendered_map is not None:
+        f.write(response.osm_map[0])
+if response.birdview_image is not None:
     file_path = f"{file_name}.jpg"
-    rendered_map = np.array(response.rendered_map, dtype=np.uint8)
+    rendered_map = np.array(response.birdview_image, dtype=np.uint8)
     image = cv2.imdecode(rendered_map, cv2.IMREAD_COLOR)
     cv2.imwrite(file_path, image)
-
 response = iai.initialize(
     location=args.location,
     agent_count=10,

diff --git a/examples/iai-drive.gif b/examples/iai-drive.gif
diff --git a/invertedai/__init__.py b/invertedai/__init__.py
@@ -4,7 +4,6 @@
     drive,
     initialize,
     location_info,
-    available_locations,
 )
 from invertedai.utils import Jupyter_Render, IAILogger, Session
 
@@ -27,16 +26,6 @@
     "location_info": ("get", "/location_info"),
     "available_locations": ("get", "/available_locations"),
 }
-try:
-    from invertedai.simulators import CarlaEnv, CarlaSimulationConfig
-except:
-    logger.warning(
-        "Cannot import CarlaEnv\n"
-        + "Carla Python API is not installed\n"
-        + "Ignore these warnings if you are not running Carla"
-    )
-
-
 __all__ = [
     "drive",
     "initialize",
@@ -46,5 +35,4 @@
     "session",
     "add_apikey",
     "location_info",
-    "available_locations",
 ]