Skip to content

Commit a8c3399

Browse files
yuandrewyuandrew
committed
Pick up core crate renames
1 parent e83a260 commit a8c3399

File tree

11 files changed

+116
-147
lines changed

11 files changed

+116
-147
lines changed

‎temporalio/bridge/Cargo.lock‎

Lines changed: 55 additions & 84 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎temporalio/bridge/Cargo.toml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ pyo3 = { version = "0.25", features = [
2828
] }
2929
pyo3-async-runtimes = { version = "0.25", features = ["tokio-runtime"] }
3030
pythonize = "0.25"
31-
temporal-client = { version = "0.1.0", path = "./sdk-core/client" }
32-
temporal-sdk-core = { version = "0.1.0", path = "./sdk-core/core", features = [
33-
"ephemeral-server",
34-
] }
35-
temporal-sdk-core-api = { version = "0.1.0", path = "./sdk-core/core-api", features = [
31+
temporalio-client = { version = "0.1.0", path = "./sdk-core/crates/client" }
32+
temporalio-common = { version = "0.1.0", path = "./sdk-core/crates/common", features = [
3633
"envconfig",
34+
]}
35+
temporalio-sdk-core = { version = "0.1.0", path = "./sdk-core/crates/sdk-core", features = [
36+
"ephemeral-server",
3737
] }
38-
temporal-sdk-core-protos = { version = "0.1.0", path = "./sdk-core/sdk-core-protos" }
3938
tokio = "1.26"
4039
tokio-stream = "0.1"
4140
tonic = "0.14"

‎temporalio/bridge/sdk-core‎

‎temporalio/bridge/src/client.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ use pyo3::prelude::*;
33
use std::collections::HashMap;
44
use std::str::FromStr;
55
use std::time::Duration;
6-
use temporal_client::{
6+
use temporalio_client::{
77
ClientKeepAliveConfig as CoreClientKeepAliveConfig, ClientOptions, ClientOptionsBuilder,
88
ConfiguredClient, HttpConnectProxyOptions, RetryClient, RetryConfig,
99
TlsConfig, TemporalServiceClient,
1010
};
11-
use temporal_client::tonic::{
11+
use temporalio_client::tonic::{
1212
self,
1313
metadata::{AsciiMetadataKey, AsciiMetadataValue, BinaryMetadataKey, BinaryMetadataValue},
1414
};
@@ -258,7 +258,7 @@ impl TryFrom<ClientConfig> for ClientOptions {
258258
}
259259
}
260260

261-
impl TryFrom<ClientTlsConfig> for temporal_client::TlsConfig {
261+
impl TryFrom<ClientTlsConfig> for temporalio_client::TlsConfig {
262262
type Error = PyErr;
263263

264264
fn try_from(conf: ClientTlsConfig) -> PyResult<Self> {
@@ -268,7 +268,7 @@ impl TryFrom<ClientTlsConfig> for temporal_client::TlsConfig {
268268
client_tls_config: match (conf.client_cert, conf.client_private_key) {
269269
(None, None) => None,
270270
(Some(client_cert), Some(client_private_key)) => {
271-
Some(temporal_client::ClientTlsConfig {
271+
Some(temporalio_client::ClientTlsConfig {
272272
client_cert,
273273
client_private_key,
274274
})

‎temporalio/bridge/src/client_rpc_generated.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ impl ClientRef {
1515
py: Python<'p>,
1616
call: RpcCall,
1717
) -> PyResult<Bound<'p, PyAny>> {
18-
use temporal_client::WorkflowService;
18+
use temporalio_client::WorkflowService;
1919
let mut retry_client = self.retry_client.clone();
2020
self.runtime.future_into_py(py, async move {
2121
let bytes = match call.rpc.as_str() {
@@ -566,7 +566,7 @@ impl ClientRef {
566566
py: Python<'p>,
567567
call: RpcCall,
568568
) -> PyResult<Bound<'p, PyAny>> {
569-
use temporal_client::OperatorService;
569+
use temporalio_client::OperatorService;
570570
let mut retry_client = self.retry_client.clone();
571571
self.runtime.future_into_py(py, async move {
572572
let bytes = match call.rpc.as_str() {
@@ -628,7 +628,7 @@ impl ClientRef {
628628
}
629629

630630
fn call_cloud_service<'p>(&self, py: Python<'p>, call: RpcCall) -> PyResult<Bound<'p, PyAny>> {
631-
use temporal_client::CloudService;
631+
use temporalio_client::CloudService;
632632
let mut retry_client = self.retry_client.clone();
633633
self.runtime.future_into_py(py, async move {
634634
let bytes = match call.rpc.as_str() {
@@ -842,7 +842,7 @@ impl ClientRef {
842842
}
843843

844844
fn call_test_service<'p>(&self, py: Python<'p>, call: RpcCall) -> PyResult<Bound<'p, PyAny>> {
845-
use temporal_client::TestService;
845+
use temporalio_client::TestService;
846846
let mut retry_client = self.retry_client.clone();
847847
self.runtime.future_into_py(py, async move {
848848
let bytes = match call.rpc.as_str() {
@@ -881,7 +881,7 @@ impl ClientRef {
881881
}
882882

883883
fn call_health_service<'p>(&self, py: Python<'p>, call: RpcCall) -> PyResult<Bound<'p, PyAny>> {
884-
use temporal_client::HealthService;
884+
use temporalio_client::HealthService;
885885
let mut retry_client = self.retry_client.clone();
886886
self.runtime.future_into_py(py, async move {
887887
let bytes = match call.rpc.as_str() {

‎temporalio/bridge/src/envconfig.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use pyo3::{
44
types::{PyBytes, PyDict},
55
};
66
use std::collections::HashMap;
7-
use temporal_sdk_core_api::envconfig::{
7+
use temporalio_common::envconfig::{
88
load_client_config as core_load_client_config,
99
load_client_config_profile as core_load_client_config_profile,
1010
ClientConfig as CoreClientConfig, ClientConfigCodec,

‎temporalio/bridge/src/metric.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::{collections::HashMap, sync::Arc};
44

55
use pyo3::prelude::*;
66
use pyo3::{exceptions::PyTypeError, types::PyDict};
7-
use temporal_sdk_core_api::telemetry::metrics::{
7+
use temporalio_common::telemetry::metrics::{
88
self, BufferInstrumentRef, CustomMetricAttributes, MetricEvent, NewAttributes,
99
};
1010

‎temporalio/bridge/src/runtime.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ use std::pin::Pin;
99
use std::str::FromStr;
1010
use std::sync::Arc;
1111
use std::time::{Duration, UNIX_EPOCH};
12-
use temporal_sdk_core::telemetry::{
12+
use temporalio_sdk_core::telemetry::{
1313
build_otlp_metric_exporter, start_prometheus_metric_exporter, CoreLogStreamConsumer,
1414
MetricsCallBuffer,
1515
};
16-
use temporal_sdk_core::{CoreRuntime, RuntimeOptionsBuilder, TokioRuntimeBuilder};
17-
use temporal_sdk_core_api::telemetry::metrics::{CoreMeter, MetricCallBufferer};
18-
use temporal_sdk_core_api::telemetry::{
16+
use temporalio_sdk_core::{CoreRuntime, RuntimeOptionsBuilder, TokioRuntimeBuilder};
17+
use temporalio_common::telemetry::metrics::{CoreMeter, MetricCallBufferer};
18+
use temporalio_common::telemetry::{
1919
CoreLog, Logger, MetricTemporality, OtelCollectorOptionsBuilder, OtlpProtocol,
2020
PrometheusExporterOptionsBuilder, TelemetryOptionsBuilder,
2121
};
@@ -369,7 +369,7 @@ impl TryFrom<MetricsConfig> for Arc<dyn CoreMeter> {
369369
}
370370
if let Some(overrides) = prom_conf.histogram_bucket_overrides {
371371
build.histogram_bucket_overrides(
372-
temporal_sdk_core_api::telemetry::HistogramBucketOverrides { overrides },
372+
temporalio_common::telemetry::HistogramBucketOverrides { overrides },
373373
);
374374
}
375375
let prom_options = build.build().map_err(|err| {

‎temporalio/bridge/src/testing.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::time::Duration;
22

33
use pyo3::exceptions::{PyRuntimeError, PyValueError};
44
use pyo3::prelude::*;
5-
use temporal_sdk_core::ephemeral_server;
5+
use temporalio_sdk_core::ephemeral_server;
66

77
use crate::runtime;
88

0 commit comments

Comments
 (0)