Skip to content

Commit d35f71f

Browse files
tensorflower-gardenertensorflow-copybara
tensorflower-gardener
authored and
tensorflow-copybara
committed
Automated Code Change
PiperOrigin-RevId: 685168880
1 parent afe660d commit d35f71f

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

‎tensorflow_serving/model_servers/tfrt_http_rest_api_handler.cc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ TFRTHttpRestApiHandler::TFRTHttpRestApiHandler(int timeout_in_ms,
6262

6363
TFRTHttpRestApiHandler::~TFRTHttpRestApiHandler() {}
6464

65-
Status TFRTHttpRestApiHandler::ProcessRequest(
65+
absl::Status TFRTHttpRestApiHandler::ProcessRequest(
6666
const absl::string_view http_method, const absl::string_view request_path,
6767
const absl::string_view request_body,
6868
std::vector<std::pair<std::string, std::string>>* headers,
@@ -72,8 +72,8 @@ Status TFRTHttpRestApiHandler::ProcessRequest(
7272
AddHeaders(headers);
7373

7474
std::string model_subresource;
75-
Status status = errors::InvalidArgument("Malformed request: ", http_method,
76-
" ", request_path);
75+
absl::Status status = errors::InvalidArgument(
76+
"Malformed request: ", http_method, " ", request_path);
7777
absl::optional<int64_t> model_version;
7878
absl::optional<std::string> model_version_label;
7979
bool parse_successful;
@@ -114,7 +114,7 @@ Status TFRTHttpRestApiHandler::ProcessRequest(
114114
return status;
115115
}
116116

117-
Status TFRTHttpRestApiHandler::ProcessClassifyRequest(
117+
absl::Status TFRTHttpRestApiHandler::ProcessClassifyRequest(
118118
const absl::string_view model_name,
119119
const absl::optional<int64_t>& model_version,
120120
const absl::optional<absl::string_view>& model_version_label,
@@ -135,10 +135,10 @@ Status TFRTHttpRestApiHandler::ProcessClassifyRequest(
135135
TF_RETURN_IF_ERROR(servable->Classify(run_options, *request, response));
136136
TF_RETURN_IF_ERROR(
137137
MakeJsonFromClassificationResult(response->result(), output));
138-
return Status();
138+
return absl::Status();
139139
}
140140

141-
Status TFRTHttpRestApiHandler::ProcessRegressRequest(
141+
absl::Status TFRTHttpRestApiHandler::ProcessRegressRequest(
142142
const absl::string_view model_name,
143143
const absl::optional<int64_t>& model_version,
144144
const absl::optional<absl::string_view>& model_version_label,
@@ -160,7 +160,7 @@ Status TFRTHttpRestApiHandler::ProcessRegressRequest(
160160
return MakeJsonFromRegressionResult(response->result(), output);
161161
}
162162

163-
Status TFRTHttpRestApiHandler::ProcessPredictRequest(
163+
absl::Status TFRTHttpRestApiHandler::ProcessPredictRequest(
164164
const absl::string_view model_name,
165165
const absl::optional<int64_t>& model_version,
166166
const absl::optional<absl::string_view>& model_version_label,
@@ -190,10 +190,10 @@ Status TFRTHttpRestApiHandler::ProcessPredictRequest(
190190
TF_RETURN_IF_ERROR(servable->Predict(run_options, *request, response));
191191

192192
TF_RETURN_IF_ERROR(MakeJsonFromTensors(response->outputs(), format, output));
193-
return Status();
193+
return absl::Status();
194194
}
195195

196-
Status TFRTHttpRestApiHandler::ProcessModelStatusRequest(
196+
absl::Status TFRTHttpRestApiHandler::ProcessModelStatusRequest(
197197
const absl::string_view model_name,
198198
const absl::optional<int64_t>& model_version,
199199
const absl::optional<absl::string_view>& model_version_label,
@@ -217,7 +217,7 @@ Status TFRTHttpRestApiHandler::ProcessModelStatusRequest(
217217
return ToJsonString(*response, output);
218218
}
219219

220-
Status TFRTHttpRestApiHandler::ProcessModelMetadataRequest(
220+
absl::Status TFRTHttpRestApiHandler::ProcessModelMetadataRequest(
221221
const absl::string_view model_name,
222222
const absl::optional<int64_t>& model_version,
223223
const absl::optional<absl::string_view>& model_version_label,
@@ -242,7 +242,7 @@ Status TFRTHttpRestApiHandler::ProcessModelMetadataRequest(
242242
return ToJsonString(*response, output);
243243
}
244244

245-
Status TFRTHttpRestApiHandler::GetInfoMap(
245+
absl::Status TFRTHttpRestApiHandler::GetInfoMap(
246246
const ModelSpec& model_spec, const std::string& signature_name,
247247
::google::protobuf::Map<std::string, tensorflow::TensorInfo>* infomap) {
248248
ServableHandle<Servable> servable;
@@ -257,7 +257,7 @@ Status TFRTHttpRestApiHandler::GetInfoMap(
257257
"\" not found in signature def");
258258
}
259259
*infomap = iter->second.inputs();
260-
return Status();
260+
return absl::Status();
261261
}
262262

263263
} // namespace serving

‎tensorflow_serving/model_servers/tfrt_http_rest_api_handler_test.cc

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ class TFRTHttpRestApiHandlerTest : public ::testing::Test {
8585
TFRTHttpRestApiHandlerTest()
8686
: handler_(/*timeout_in_ms=*/10000, GetServerCore()) {}
8787

88-
static Status CreateServerCore(std::unique_ptr<ServerCore>* server_core) {
88+
static absl::Status CreateServerCore(
89+
std::unique_ptr<ServerCore>* server_core) {
8990
ModelServerConfig config;
9091
auto model_config = config.mutable_model_config_list()->add_config();
9192
model_config->set_name(kTestModelName);
@@ -158,7 +159,7 @@ class TFRTHttpRestApiHandlerTest : public ::testing::Test {
158159

159160
std::unique_ptr<ServerCore> TFRTHttpRestApiHandlerTest::server_core_;
160161

161-
Status CompareJson(const string& json1, const string& json2) {
162+
absl::Status CompareJson(const string& json1, const string& json2) {
162163
rapidjson::Document doc1;
163164
if (doc1.Parse(json1.c_str()).HasParseError()) {
164165
return errors::InvalidArgument(
@@ -175,7 +176,7 @@ Status CompareJson(const string& json1, const string& json2) {
175176
return errors::InvalidArgument("JSON Different. JSON1: ", json1,
176177
"JSON2: ", json2);
177178
}
178-
return Status();
179+
return absl::Status();
179180
}
180181

181182
TEST_F(TFRTHttpRestApiHandlerTest, kPathRegex) {
@@ -187,7 +188,7 @@ TEST_F(TFRTHttpRestApiHandlerTest, kPathRegex) {
187188
TEST_F(TFRTHttpRestApiHandlerTest, UnsupportedApiCalls) {
188189
HeaderList headers;
189190
string model_name, method, output;
190-
Status status;
191+
absl::Status status;
191192
status = handler_.ProcessRequest("GET", "/v1/foo", "", &headers, &model_name,
192193
&method, &output);
193194
EXPECT_TRUE(errors::IsInvalidArgument(status));
@@ -264,7 +265,7 @@ TEST_F(TFRTHttpRestApiHandlerTest, UnsupportedApiCalls) {
264265
TEST_F(TFRTHttpRestApiHandlerTest, PredictModelNameVersionErrors) {
265266
HeaderList headers;
266267
string model_name, method, output;
267-
Status status;
268+
absl::Status status;
268269
// 'foo' is not a valid model name.
269270
status = handler_.ProcessRequest("POST", "/v1/models/foo:predict",
270271
R"({ "instances": [1] })", &headers,
@@ -287,7 +288,7 @@ TEST_F(TFRTHttpRestApiHandlerTest, PredictModelNameVersionErrors) {
287288
TEST_F(TFRTHttpRestApiHandlerTest, PredictRequestErrors) {
288289
HeaderList headers;
289290
string model_name, method, output;
290-
Status status;
291+
absl::Status status;
291292
const string& req_path =
292293
absl::StrCat("/v1/models/", kTestModelName, ":predict");
293294

@@ -334,7 +335,7 @@ TEST_F(TFRTHttpRestApiHandlerTest, PredictRequestErrors) {
334335
TEST_F(TFRTHttpRestApiHandlerTest, Predict) {
335336
HeaderList headers;
336337
string model_name, method, output;
337-
Status status;
338+
absl::Status status;
338339
// Query latest version.
339340
TF_EXPECT_OK(handler_.ProcessRequest(
340341
"POST", absl::StrCat("/v1/models/", kTestModelName, ":predict"),
@@ -391,7 +392,7 @@ TEST_F(TFRTHttpRestApiHandlerTest, Predict) {
391392
TEST_F(TFRTHttpRestApiHandlerTest, Regress) {
392393
HeaderList headers;
393394
string model_name, method, output;
394-
Status status;
395+
absl::Status status;
395396
// Query latest version.
396397
TF_EXPECT_OK(handler_.ProcessRequest(
397398
"POST", absl::StrCat("/v1/models/", kTestModelName, ":regress"),
@@ -427,7 +428,7 @@ TEST_F(TFRTHttpRestApiHandlerTest, Regress) {
427428
TEST_F(TFRTHttpRestApiHandlerTest, Classify) {
428429
HeaderList headers;
429430
string model_name, method, output;
430-
Status status;
431+
absl::Status status;
431432
// Query latest version.
432433
TF_EXPECT_OK(handler_.ProcessRequest(
433434
"POST", absl::StrCat("/v1/models/", kTestModelName, ":classify"),
@@ -452,7 +453,7 @@ TEST_F(TFRTHttpRestApiHandlerTest, Classify) {
452453
TEST_F(TFRTHttpRestApiHandlerTest, GetStatus) {
453454
HeaderList headers;
454455
string model_name, method, output;
455-
Status status;
456+
absl::Status status;
456457

457458
// Get status for all versions.
458459
TF_EXPECT_OK(handler_.ProcessRequest(

‎tensorflow_serving/model_servers/tfrt_prediction_service_impl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ ::grpc::Status TfrtPredictionServiceImpl::Predict(
7474
::grpc::Status TfrtPredictionServiceImpl::GetModelMetadata(
7575
::grpc::ServerContext *context, const GetModelMetadataRequest *request,
7676
GetModelMetadataResponse *response) {
77-
const ::tensorflow::Status tf_status =
77+
const absl::Status tf_status =
7878
TFRTGetModelMetadataImpl::GetModelMetadata(core_, *request, response);
7979
const ::grpc::Status status = ToGRPCStatus(tf_status);
8080
if (!status.ok()) {

0 commit comments

Comments
 (0)