Skip to content

Commit

Permalink
Merge 0.15.1 notebook fix to main (rerun-io#5928)
Browse files Browse the repository at this point in the history
### Checklist
* [x] I have read and agree to [Contributor
Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and
the [Code of
Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md)

- [PR Build Summary](https://build.rerun.io/pr/5928)
- [Recent benchmark results](https://build.rerun.io/graphs/crates.html)
- [Wasm size tracking](https://build.rerun.io/graphs/sizes.html)

---------

Co-authored-by: Andreas Reich <[email protected]>
Co-authored-by: Clement Rey <[email protected]>
Co-authored-by: Antoine Beyeler <[email protected]>
Co-authored-by: Jeremy Leibs <[email protected]>
  • Loading branch information
5 people authored Apr 11, 2024
1 parent 69ce7d4 commit c45073b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,6 @@ Check out our [migration guide](https://www.rerun.io/docs/reference/migration/mi

## [0.12.0](https://github.com/rerun-io/rerun/compare/0.11.0...0.12.0) - Data Loaders, Container-editing, Python-3.12 - 2024-01-09

### ✨ Overview & highlights
### ✨ Overview & highlights
- 🌁 The Rerun Viewer now supports a plugin system for creating [arbitrary external data loaders](https://www.rerun.io/docs/reference/data-loaders/overview).
- 🕸️ More built-in examples are now available in the viewer.
Expand Down
2 changes: 1 addition & 1 deletion examples/python/ros_node/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--[metadata]
title = "ROS node"
tags = ["2D", "3D", "mesh", "pinhole-camera", "ros", "time-series"]
tags = ["2D", "3D", "Mesh", "Pinhole camera", "ROS", "Time series"]
thumbnail = "https://static.rerun.io/ros-node/93169b35c17f5ec02d94150efb74c7ba06372842/480w.png"
thumbnail_dimensions = [480, 480]
-->
Expand Down
17 changes: 12 additions & 5 deletions rerun_py/src/python_bridge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1096,7 +1096,7 @@ fn version() -> String {

/// Get a url to an instance of the web-viewer
///
/// This may point to rerun.io/viewer or localhost depending on
/// This may point to app.rerun.io or localhost depending on
/// whether [`start_web_viewer_server()`] was called.
#[pyfunction]
fn get_app_url() -> String {
Expand All @@ -1106,13 +1106,20 @@ fn get_app_url() -> String {
}

let build_info = re_build_info::build_info!();
if let Some(short_git_hash) = build_info.git_hash.get(..7) {
format!("https://rerun.io/viewer/commit/{short_git_hash}")

// Note that it is important to us `app.rerun.io` directly here. The version hosted
// at `rerun.io/viewer` is not designed to be embedded in a notebook and interferes
// with the startup sequencing. Do not switch to `rerun.io/viewer` without considering
// the implications.
if build_info.is_final() {
format!("https://app.rerun.io/version/{}", build_info.version)
} else if let Some(short_git_hash) = build_info.git_hash.get(..7) {
format!("https://app.rerun.io/commit/{short_git_hash}")
} else {
re_log::warn_once!(
"No valid git hash found in build info. Defaulting to rerun.io/viewer for app url."
"No valid git hash found in build info. Defaulting to app.rerun.io for app url."
);
"https://rerun.io/viewer".to_owned()
"https://app.rerun.io".to_owned()
}
}

Expand Down

0 comments on commit c45073b

Please sign in to comment.