improvements from external prs

twitter-team · twitter-team · commit 31e82d6474cf · 2023-04-28T10:37:15.000-05:00
-fix corner case where dr converter failed when initializing Closes #550
diff --git a/navi/dr_transform/src/all_config.rs b/navi/dr_transform/src/all_config.rs
@@ -44,5 +44,6 @@ pub struct RenamedFeatures {
 }
 
 pub fn parse(json_str: &str) -> Result<AllConfig, Error> {
-    serde_json::from_str(json_str)
+    let all_config: AllConfig = serde_json::from_str(json_str)?;
+    Ok(all_config)
 }
diff --git a/navi/dr_transform/src/converter.rs b/navi/dr_transform/src/converter.rs
diff --git a/navi/navi/proto/tensorflow/core/framework/full_type.proto b/navi/navi/proto/tensorflow/core/framework/full_type.proto
@@ -122,7 +122,7 @@ enum FullTypeId {
   //   TFT_TENSOR[TFT_INT32, TFT_UNKNOWN]
   //     is a Tensor of int32 element type and unknown shape.
   //
-  // TODO: Define TFT_SHAPE and add more examples.
+  // TODO(mdan): Define TFT_SHAPE and add more examples.
   TFT_TENSOR = 1000;
 
   // Array (or tensorflow::TensorList in the variant type registry).
@@ -178,7 +178,7 @@ enum FullTypeId {
   // object (for now).
 
   // The bool element type.
-  // TODO
+  // TODO(mdan): Quantized types, legacy representations (e.g. ref)
   TFT_BOOL = 200;
   // Integer element types.
   TFT_UINT8 = 201;
@@ -195,7 +195,7 @@ enum FullTypeId {
   TFT_DOUBLE = 211;
   TFT_BFLOAT16 = 215;
   // Complex element types.
-  // TODO: Represent as TFT_COMPLEX[TFT_DOUBLE] instead?
+  // TODO(mdan): Represent as TFT_COMPLEX[TFT_DOUBLE] instead?
   TFT_COMPLEX64 = 212;
   TFT_COMPLEX128 = 213;
   // The string element type.
@@ -240,7 +240,7 @@ enum FullTypeId {
   // ownership is in the true sense: "the op argument representing the lock is
   // available".
   // Mutex locks are the dynamic counterpart of control dependencies.
-  // TODO: Properly document this thing.
+  // TODO(mdan): Properly document this thing.
   //
   // Parametrization: TFT_MUTEX_LOCK[].
   TFT_MUTEX_LOCK = 10202;
@@ -271,6 +271,6 @@ message FullTypeDef {
   oneof attr {
     string s = 3;
     int64 i = 4;
-    // TODO: list/tensor, map? Need to reconcile with TFT_RECORD, etc.
+    // TODO(mdan): list/tensor, map? Need to reconcile with TFT_RECORD, etc.
   }
 }
diff --git a/navi/navi/proto/tensorflow/core/framework/function.proto b/navi/navi/proto/tensorflow/core/framework/function.proto
@@ -23,7 +23,7 @@ message FunctionDefLibrary {
 // with a value. When a GraphDef has a call to a function, it must
 // have binding for every attr defined in the signature.
 //
-// TODO:
+// TODO(zhifengc):
 //   * device spec, etc.
 message FunctionDef {
   // The definition of the function's name, arguments, return values,
diff --git a/navi/navi/proto/tensorflow/core/framework/node_def.proto b/navi/navi/proto/tensorflow/core/framework/node_def.proto
@@ -61,7 +61,7 @@ message NodeDef {
   // one of the names from the corresponding OpDef's attr field).
   // The values must have a type matching the corresponding OpDef
   // attr's type field.
-  // TODO: Add some examples here showing best practices.
+  // TODO(josh11b): Add some examples here showing best practices.
   map<string, AttrValue> attr = 5;
 
   message ExperimentalDebugInfo {
diff --git a/navi/navi/proto/tensorflow/core/framework/op_def.proto b/navi/navi/proto/tensorflow/core/framework/op_def.proto
@@ -96,7 +96,7 @@ message OpDef {
     // Human-readable description.
     string description = 4;
 
-    // TODO: bool is_optional?
+    // TODO(josh11b): bool is_optional?
 
     // --- Constraints ---
     // These constraints are only in effect if specified.  Default is no
@@ -139,7 +139,7 @@ message OpDef {
   // taking input from multiple devices with a tree of aggregate ops
   // that aggregate locally within each device (and possibly within
   // groups of nearby devices) before communicating.
-  // TODO: Implement that optimization.
+  // TODO(josh11b): Implement that optimization.
   bool is_aggregate = 16;  // for things like add
 
   // Other optimizations go here, like
diff --git a/navi/navi/proto/tensorflow/core/framework/step_stats.proto b/navi/navi/proto/tensorflow/core/framework/step_stats.proto
@@ -53,7 +53,7 @@ message MemoryStats {
 
 // Time/size stats recorded for a single execution of a graph node.
 message NodeExecStats {
-  // TODO: Use some more compact form of node identity than
+  // TODO(tucker): Use some more compact form of node identity than
   // the full string name.  Either all processes should agree on a
   // global id (cost_id?) for each node, or we should use a hash of
   // the name.
diff --git a/navi/navi/proto/tensorflow/core/framework/tensor.proto b/navi/navi/proto/tensorflow/core/framework/tensor.proto
@@ -16,7 +16,7 @@ option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framewo
 message TensorProto {
   DataType dtype = 1;
 
-  // Shape of the tensor.  TODO: sort out the 0-rank issues.
+  // Shape of the tensor.  TODO(touts): sort out the 0-rank issues.
   TensorShapeProto tensor_shape = 2;
 
   // Only one of the representations below is set, one of "tensor_contents" and
diff --git a/navi/navi/proto/tensorflow/core/protobuf/config.proto b/navi/navi/proto/tensorflow/core/protobuf/config.proto
@@ -532,7 +532,7 @@ message ConfigProto {
 
     // We removed the flag client_handles_error_formatting. Marking the tag
     // number as reserved.
-    // TODO: Should we just remove this tag so that it can be
+    // TODO(shikharagarwal): Should we just remove this tag so that it can be
     // used in future for other purpose?
     reserved 2;
 
@@ -576,7 +576,7 @@ message ConfigProto {
     // - If isolate_session_state is true, session states are isolated.
     // - If isolate_session_state is false, session states are shared.
     //
-    // TODO: Add a single API that consistently treats
+    // TODO(b/129330037): Add a single API that consistently treats
     // isolate_session_state and ClusterSpec propagation.
     bool share_session_state_in_clusterspec_propagation = 8;
 
@@ -704,7 +704,7 @@ message ConfigProto {
 
 // Options for a single Run() call.
 message RunOptions {
-  // TODO Turn this into a TraceOptions proto which allows
+  // TODO(pbar) Turn this into a TraceOptions proto which allows
   // tracing to be controlled in a more orthogonal manner?
   enum TraceLevel {
     NO_TRACE = 0;
@@ -781,7 +781,7 @@ message RunMetadata {
   repeated GraphDef partition_graphs = 3;
 
   message FunctionGraphs {
-    // TODO: Include some sort of function/cache-key identifier?
+    // TODO(nareshmodi): Include some sort of function/cache-key identifier?
     repeated GraphDef partition_graphs = 1;
 
     GraphDef pre_optimization_graph = 2;
diff --git a/navi/navi/proto/tensorflow/core/protobuf/coordination_service.proto b/navi/navi/proto/tensorflow/core/protobuf/coordination_service.proto
@@ -194,7 +194,7 @@ service CoordinationService {
 
   // Report error to the task. RPC sets the receiving instance of coordination
   // service agent to error state permanently.
-  // TODO: Consider splitting this into a different RPC service.
+  // TODO(b/195990880): Consider splitting this into a different RPC service.
   rpc ReportErrorToAgent(ReportErrorToAgentRequest)
       returns (ReportErrorToAgentResponse);
 
diff --git a/navi/navi/proto/tensorflow/core/protobuf/debug.proto b/navi/navi/proto/tensorflow/core/protobuf/debug.proto
@@ -46,7 +46,7 @@ message DebugTensorWatch {
   // are to be debugged, the callers of Session::Run() must use distinct
   // debug_urls to make sure that the streamed or dumped events do not overlap
   // among the invocations.
-  // TODO: More visible documentation of this in g3docs.
+  // TODO(cais): More visible documentation of this in g3docs.
   repeated string debug_urls = 4;
 
   // Do not error out if debug op creation fails (e.g., due to dtype
diff --git a/navi/navi/proto/tensorflow/core/protobuf/debug_event.proto b/navi/navi/proto/tensorflow/core/protobuf/debug_event.proto
@@ -12,7 +12,7 @@ option java_package = "org.tensorflow.util";
 option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto";
 
 // Available modes for extracting debugging information from a Tensor.
-// TODO: Document the detailed column names and semantics in a separate
+// TODO(cais): Document the detailed column names and semantics in a separate
 // markdown file once the implementation settles.
 enum TensorDebugMode {
   UNSPECIFIED = 0;
@@ -223,7 +223,7 @@ message DebuggedDevice {
   // A debugger-generated ID for the device. Guaranteed to be unique within
   // the scope of the debugged TensorFlow program, including single-host and
   // multi-host settings.
-  // TODO: Test the uniqueness guarantee in multi-host settings.
+  // TODO(cais): Test the uniqueness guarantee in multi-host settings.
   int32 device_id = 2;
 }
 
@@ -264,7 +264,7 @@ message Execution {
   // field with the DebuggedDevice messages.
   repeated int32 output_tensor_device_ids = 9;
 
-  // TODO support, add more fields
+  // TODO(cais): When backporting to V1 Session.run() support, add more fields
   // such as fetches and feeds.
 }
 
diff --git a/navi/navi/proto/tensorflow/core/protobuf/distributed_runtime_payloads.proto b/navi/navi/proto/tensorflow/core/protobuf/distributed_runtime_payloads.proto
@@ -7,7 +7,7 @@ option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobu
 
 // Used to serialize and transmit tensorflow::Status payloads through
 // grpc::Status `error_details` since grpc::Status lacks payload API.
-// TODO: Use GRPC API once supported.
+// TODO(b/204231601): Use GRPC API once supported.
 message GrpcPayloadContainer {
   map<string, bytes> payloads = 1;
 }
diff --git a/navi/navi/proto/tensorflow/core/protobuf/eager_service.proto b/navi/navi/proto/tensorflow/core/protobuf/eager_service.proto
@@ -172,7 +172,7 @@ message WaitQueueDoneRequest {
 }
 
 message WaitQueueDoneResponse {
-  // TODO: Consider adding NodeExecStats here to be able to
+  // TODO(nareshmodi): Consider adding NodeExecStats here to be able to
   // propagate some stats.
 }
 
diff --git a/navi/navi/proto/tensorflow/core/protobuf/master.proto b/navi/navi/proto/tensorflow/core/protobuf/master.proto
@@ -94,7 +94,7 @@ message ExtendSessionRequest {
 }
 
 message ExtendSessionResponse {
-  // TODO: Return something about the operation?
+  // TODO(mrry): Return something about the operation?
 
   // The new version number for the extended graph, to be used in the next call
   // to ExtendSession.
diff --git a/navi/navi/proto/tensorflow/core/protobuf/saved_object_graph.proto b/navi/navi/proto/tensorflow/core/protobuf/saved_object_graph.proto
@@ -176,7 +176,7 @@ message SavedBareConcreteFunction {
   // allows the ConcreteFunction to be called with nest structure inputs. This
   // field may not be populated. If this field is absent, the concrete function
   // can only be called with flat inputs.
-  // TODO: support calling saved ConcreteFunction with structured
+  // TODO(b/169361281): support calling saved ConcreteFunction with structured
   // inputs in C++ SavedModel API.
   FunctionSpec function_spec = 4;
 }
diff --git a/navi/navi/proto/tensorflow/core/protobuf/tensor_bundle.proto b/navi/navi/proto/tensorflow/core/protobuf/tensor_bundle.proto
@@ -17,7 +17,7 @@ option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobu
 
 // Special header that is associated with a bundle.
 //
-// TODO: maybe in the future, we can add information about
+// TODO(zongheng,zhifengc): maybe in the future, we can add information about
 // which binary produced this checkpoint, timestamp, etc. Sometime, these can be
 // valuable debugging information. And if needed, these can be used as defensive
 // information ensuring reader (binary version) of the checkpoint and the writer
diff --git a/navi/navi/proto/tensorflow/core/protobuf/worker.proto b/navi/navi/proto/tensorflow/core/protobuf/worker.proto
@@ -188,7 +188,7 @@ message DeregisterGraphRequest {
 }
 
 message DeregisterGraphResponse {
-  // TODO: Optionally add summary stats for the graph.
+  // TODO(mrry): Optionally add summary stats for the graph.
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -294,7 +294,7 @@ message RunGraphResponse {
 
   // If the request asked for execution stats, the cost graph, or the partition
   // graphs, these are returned here.
-  // TODO: Package these in a RunMetadata instead.
+  // TODO(suharshs): Package these in a RunMetadata instead.
   StepStats step_stats = 2;
   CostGraphDef cost_graph = 3;
   repeated GraphDef partition_graph = 4;
diff --git a/navi/navi/proto/tensorflow_serving/apis/logging.proto b/navi/navi/proto/tensorflow_serving/apis/logging.proto
@@ -13,5 +13,5 @@ message LogMetadata {
   SamplingConfig sampling_config = 2;
   // List of tags used to load the relevant MetaGraphDef from SavedModel.
   repeated string saved_model_tags = 3;
-  // TODO: Add more metadata as mentioned in the bug.
+  // TODO(b/33279154): Add more metadata as mentioned in the bug.
 }
diff --git a/navi/navi/proto/tensorflow_serving/config/file_system_storage_path_source.proto b/navi/navi/proto/tensorflow_serving/config/file_system_storage_path_source.proto
@@ -58,7 +58,7 @@ message FileSystemStoragePathSourceConfig {
 
   // A single servable name/base_path pair to monitor.
   // DEPRECATED: Use 'servables' instead.
-  // TODO: Stop using these fields, and ultimately remove them here.
+  // TODO(b/30898016): Stop using these fields, and ultimately remove them here.
   string servable_name = 1 [deprecated = true];
   string base_path = 2 [deprecated = true];
 
@@ -76,7 +76,7 @@ message FileSystemStoragePathSourceConfig {
   // check for a version to appear later.)
   // DEPRECATED: Use 'servable_versions_always_present' instead, which includes
   // this behavior.
-  // TODO: Remove 2019-10-31 or later.
+  // TODO(b/30898016): Remove 2019-10-31 or later.
   bool fail_if_zero_versions_at_startup = 4 [deprecated = true];
 
   // If true, the servable is always expected to exist on the underlying
diff --git a/navi/navi/proto/tensorflow_serving/config/model_server_config.proto b/navi/navi/proto/tensorflow_serving/config/model_server_config.proto
@@ -9,7 +9,7 @@ import "tensorflow_serving/config/logging_config.proto";
 option cc_enable_arenas = true;
 
 // The type of model.
-// TODO: DEPRECATED.
+// TODO(b/31336131): DEPRECATED.
 enum ModelType {
   MODEL_TYPE_UNSPECIFIED = 0 [deprecated = true];
   TENSORFLOW = 1 [deprecated = true];
@@ -31,7 +31,7 @@ message ModelConfig {
   string base_path = 2;
 
   // Type of model.
-  // TODO: DEPRECATED. Please use 'model_platform' instead.
+  // TODO(b/31336131): DEPRECATED. Please use 'model_platform' instead.
   ModelType model_type = 3 [deprecated = true];
 
   // Type of model (e.g. "tensorflow").
diff --git a/navi/navi/src/bootstrap.rs b/navi/navi/src/bootstrap.rs
@@ -1,5 +1,6 @@
 use anyhow::Result;
 use log::{info, warn};
+use x509_parser::{prelude::{parse_x509_pem}, parse_x509_certificate};
 use std::collections::HashMap;
 use tokio::time::Instant;
 use tonic::{
@@ -27,6 +28,7 @@ use crate::cli_args::{ARGS, INPUTS, OUTPUTS};
 use crate::metrics::{
     NAVI_VERSION, NUM_PREDICTIONS, NUM_REQUESTS_FAILED, NUM_REQUESTS_FAILED_BY_MODEL,
     NUM_REQUESTS_RECEIVED, NUM_REQUESTS_RECEIVED_BY_MODEL, RESPONSE_TIME_COLLECTOR,
+    CERT_EXPIRY_EPOCH
 };
 use crate::predict_service::{Model, PredictService};
 use crate::tf_proto::tensorflow_serving::model_spec::VersionChoice::Version;
@@ -233,6 +235,12 @@ impl<T: Model> PredictionService for PredictService<T> {
     }
 }
 
+// A function that takes a timestamp as input and returns a ticker stream
+fn report_expiry(expiry_time: i64) {
+    info!("Certificate expires at epoch: {:?}", expiry_time);
+    CERT_EXPIRY_EPOCH.set(expiry_time as i64);
+}
+
 pub fn bootstrap<T: Model>(model_factory: ModelFactory<T>) -> Result<()> {
     info!("package: {}, version: {}, args: {:?}", NAME, VERSION, *ARGS);
     //we follow SemVer. So here we assume MAJOR.MINOR.PATCH
@@ -249,6 +257,7 @@ pub fn bootstrap<T: Model>(model_factory: ModelFactory<T>) -> Result<()> {
         );
     }
 
+    
     tokio::runtime::Builder::new_multi_thread()
         .thread_name("async worker")
         .worker_threads(ARGS.num_worker_threads)
@@ -266,6 +275,21 @@ pub fn bootstrap<T: Model>(model_factory: ModelFactory<T>) -> Result<()> {
             let mut builder = if ARGS.ssl_dir.is_empty() {
                 Server::builder()
             } else {
+                // Read the pem file as a string
+                let pem_str = std::fs::read_to_string(format!("{}/server.crt", ARGS.ssl_dir)).unwrap();
+                let res = parse_x509_pem(&pem_str.as_bytes());
+                match res {
+                    Ok((rem, pem_2)) => {
+                        assert!(rem.is_empty());
+                        assert_eq!(pem_2.label, String::from("CERTIFICATE"));
+                        let res_x509 = parse_x509_certificate(&pem_2.contents);
+                        info!("Certificate label: {}", pem_2.label);
+                        assert!(res_x509.is_ok());
+                        report_expiry(res_x509.unwrap().1.validity().not_after.timestamp());
+                    },
+                    _ => panic!("PEM parsing failed: {:?}", res),
+                }
+
                 let key = tokio::fs::read(format!("{}/server.key", ARGS.ssl_dir))
                     .await
                     .expect("can't find key file");
@@ -281,7 +305,7 @@ pub fn bootstrap<T: Model>(model_factory: ModelFactory<T>) -> Result<()> {
                 let identity = Identity::from_pem(pem.clone(), key);
                 let client_ca_cert = Certificate::from_pem(pem.clone());
                 let tls = ServerTlsConfig::new()
-                    .identity(identity)
+                    .identity(identity) 
                     .client_ca_root(client_ca_cert);
                 Server::builder()
                     .tls_config(tls)
diff --git a/navi/navi/src/metrics.rs b/navi/navi/src/metrics.rs
@@ -171,6 +171,9 @@ lazy_static! {
         &["model_name"]
     )
     .expect("metric can be created");
+    pub static ref CERT_EXPIRY_EPOCH: IntGauge =
+        IntGauge::new(":navi:cert_expiry_epoch", "Timestamp when the current cert expires")
+            .expect("metric can be created");
 }
 
 pub fn register_custom_metrics() {
@@ -249,6 +252,10 @@ pub fn register_custom_metrics() {
     REGISTRY
         .register(Box::new(CONVERTER_TIME_COLLECTOR.clone()))
         .expect("collector can be registered");
+    REGISTRY
+    .register(Box::new(CERT_EXPIRY_EPOCH.clone()))
+    .expect("collector can be registered");
+
 }
 
 pub fn register_dynamic_metrics(c: &HistogramVec) {
diff --git a/navi/navi/src/onnx_model.rs b/navi/navi/src/onnx_model.rs
@@ -189,7 +189,7 @@ pub mod onnx {
                     &version,
                     reporting_feature_ids,
                     Some(metrics::register_dynamic_metrics),
-                )),
+                )?),
             };
             onnx_model.warmup()?;
             Ok(onnx_model)
diff --git a/navi/navi/src/predict_service.rs b/navi/navi/src/predict_service.rs
diff --git a/navi/segdense/src/error.rs b/navi/segdense/src/error.rs
diff --git a/navi/segdense/src/lib.rs b/navi/segdense/src/lib.rs
diff --git a/navi/segdense/src/main.rs b/navi/segdense/src/main.rs
diff --git a/navi/segdense/src/mapper.rs b/navi/segdense/src/mapper.rs
diff --git a/navi/segdense/src/segdense_transform_spec_home_recap_2022.rs b/navi/segdense/src/segdense_transform_spec_home_recap_2022.rs
diff --git a/navi/segdense/src/util.rs b/navi/segdense/src/util.rs

Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,6 @@ pub struct RenamedFeatures {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`pub fn parse(json_str: &str) -> Result<AllConfig, Error> {`
`47`		`- serde_json::from_str(json_str)`
	`47`	`+ let all_config: AllConfig = serde_json::from_str(json_str)?;`
	`48`	`+ Ok(all_config)`
`48`	`49`	`}`