Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

26 changes: 24 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ prost-types = "0.14"
thiserror = "1.0"
anyhow = "1.0"

# Data parsing - TSON format from Tercen
rustson = { git = "https://github.com/tercen/rustson", branch = "master" }
# Data parsing
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
once_cell = "1.19"
Expand All @@ -47,6 +46,12 @@ base64 = "0.22"
# UUID generation
uuid = { version = "1.0", features = ["v4"] }

# Tercen SDK
# Use local path for development:
# tercen-rs = { path = "../tercen-rs" }
# Use git dependency for CI/production:
tercen-rs = { git = "https://github.com/tercen/tercen-rs", branch = "main" }

# GGRS plotting library with WebGPU backend
# Use local path for development:
# ggrs-core = { path = "../ggrs/crates/ggrs-core", features = ["webgpu-backend", "cairo-backend"] }
Expand All @@ -61,9 +66,6 @@ jemalloc = ["tikv-jemallocator"]
version = "0.6"
optional = true

[build-dependencies]
tonic-prost-build = "0.14"

[profile.release]
opt-level = 3
lto = true
Expand Down
9 changes: 0 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,9 @@ WORKDIR /app
COPY Cargo.toml ./
COPY Cargo.lock ./

# Copy build script
COPY build.rs ./

# Copy proto files submodule (needed for build.rs)
COPY tercen_grpc_api ./tercen_grpc_api

# Copy source tree
COPY src ./src

# Copy palettes.json (used by include_str! at compile time)
COPY palettes.json ./

# Copy operator.json (used by include_str! at compile time)
COPY operator.json ./

Expand Down
16 changes: 0 additions & 16 deletions build.rs

This file was deleted.

2 changes: 1 addition & 1 deletion operator.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"communicationProtocol": "grpc",
"authors": ["Tercen"],
"urls": ["https://github.com/tercen/ggrs_plot_operator"],
"container": "ghcr.io/tercen/ggrs_plot_operator:main",
"container": "ghcr.io/tercen/ggrs_plot_operator:extract-tercen-rs",
"operatorSpec": {
"kind": "OperatorSpec",
"ontologyUri": "https://tercen.com/_ontology/tercen",
Expand Down
4 changes: 2 additions & 2 deletions src/bin/dev.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
use ggrs_plot_operator::config::OperatorConfig;
use ggrs_plot_operator::memprof;
use ggrs_plot_operator::pipeline;
use ggrs_plot_operator::tercen::{DevContext, TercenClient, TercenContext};
use std::sync::Arc;
use std::time::Instant;
use tercen_rs::{DevContext, TercenClient, TercenContext};

fn log_phase(start: Instant, phase: &str) {
let elapsed = start.elapsed();
Expand Down Expand Up @@ -117,8 +117,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
fn load_dev_config(
ui_point_size: Option<i32>,
) -> Result<OperatorConfig, Box<dyn std::error::Error>> {
use ggrs_plot_operator::tercen::client::proto::{OperatorRef, OperatorSettings, PropertyValue};
use std::fs;
use tercen_rs::client::proto::{OperatorRef, OperatorSettings, PropertyValue};

let config_path = "operator_config.json";
let config_json = match fs::read_to_string(config_path) {
Expand Down
4 changes: 2 additions & 2 deletions src/bin/prepare.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
//! cargo run --bin prepare -- --delete-project PROJECT_ID
//! ```

use ggrs_plot_operator::tercen::client::proto;
use ggrs_plot_operator::tercen::TercenClient;
use std::sync::Arc;
use tercen_rs::client::proto;
use tercen_rs::TercenClient;

#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
Expand Down
8 changes: 4 additions & 4 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
//! Property definitions and defaults are parsed from operator.json at compile time
//! via the `OperatorPropertyReader` which ensures single-source-of-truth for defaults.

use crate::tercen::client::proto::OperatorSettings;
use crate::tercen::operator_properties::OperatorPropertyReader;
use crate::tercen::properties::PlotDimension;
use crate::operator_props::OperatorPropertyReader;
use tercen_rs::client::proto::OperatorSettings;
use tercen_rs::PlotDimension;

/// How to aggregate multiple data points in the same heatmap cell
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
Expand Down Expand Up @@ -369,7 +369,7 @@ impl OperatorConfig {
/// but not yet used by GGRS for positioning along edges - that requires extending
/// the GGRS rendering logic.
pub fn to_legend_position(&self) -> ggrs_core::theme::LegendPosition {
use crate::tercen::operator_properties::registry;
use crate::operator_props::registry;
use ggrs_core::theme::LegendPosition;

match self.legend_position.to_lowercase().as_str() {
Expand Down
Loading