Update grpc version (#1140)

* Update grpc version

* Update grpc version

* Add include optional

.devcontainer/Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y \
 
 # install gRPC
 RUN cd / && \
-  git clone --recurse-submodules -b v1.39.0 https://github.com/grpc/grpc && \
+  git clone --recurse-submodules -b v1.49.1 https://github.com/grpc/grpc && \
   cd grpc && \
   mkdir -p cmake/build && \
   cd cmake/build && \
@@ -51,4 +51,3 @@ RUN cd /tmp && \
   make install && \
   ldconfig && \
   rm -rf /tmp/googletest
-

include/mjx/action.cpp

@@ -4,6 +4,7 @@
 #include <google/protobuf/util/message_differencer.h>
 
 #include <utility>
+#include <optional>
 
 #include "mjx/internal/action.h"
 

include/mjx/action.h

@@ -2,6 +2,7 @@
 #define MJX_PROJECT_ACTION_H
 
 #include "mjx/internal/mjx.grpc.pb.h"
+#include <optional>
 
 namespace mjx {
 class Action {

include/mjx/cmake/downloaded_grpc.cmake

@@ -30,7 +30,7 @@ set(FETCHCONTENT_UPDATES_DISCONNECTED ON)
 fetchcontent_declare(
   grpc
   GIT_REPOSITORY https://github.com/grpc/grpc.git
-  GIT_TAG v1.39.0
+  GIT_TAG v1.49.1
   GIT_PROGRESS TRUE
 )
 fetchcontent_makeavailable(grpc)

include/mjx/env.cpp

@@ -3,6 +3,7 @@
 #include <filesystem>
 #include <fstream>
 #include <utility>
+#include <optional>
 
 namespace mjx {
 

include/mjx/env.h

@@ -4,6 +4,7 @@
 #include "mjx/observation.h"
 #include "mjx/seed_generator.h"
 #include "mjx/state.h"
+#include <optional>
 
 #ifndef MJX_PROJECT_ENV_H
 #define MJX_PROJECT_ENV_H

include/mjx/event.cpp

@@ -4,6 +4,7 @@
 #include <google/protobuf/util/message_differencer.h>
 
 #include <utility>
+#include <optional>
 
 #include "mjx/internal/event.h"
 

include/mjx/event.h

@@ -2,6 +2,7 @@
 #define MJX_PROJECT_EVENT_H
 
 #include "mjx/internal/mjx.grpc.pb.h"
+#include <optional>
 
 namespace mjx {
 class Event {

include/mjx/internal/action.cpp

@@ -3,6 +3,8 @@
 #include "mjx/internal/mjx.grpc.pb.h"
 #include "mjx/internal/utils.h"
 
+#include <optional>
+
 namespace mjx::internal {
 mjxproto::Action Action::CreateDiscard(AbsolutePos who, Tile discard,
                                        std::string game_id) {

include/mjx/internal/action.h

@@ -3,6 +3,7 @@
 
 #include <memory>
 #include <utility>
+#include <optional>
 
 #include "mjx/internal/mjx.pb.h"
 #include "mjx/internal/open.h"

include/mjx/internal/game_result_summarizer.cpp

@@ -3,6 +3,8 @@
 namespace mjx::internal {
 std::recursive_mutex GameResultSummarizer::mtx_;
 
+#include <optional>
+
 int GameResultSummarizer::num_games() const { return num_games_; }
 
 void GameResultSummarizer::Initialize() {

include/mjx/internal/game_result_summarizer.h

@@ -3,6 +3,8 @@
 
 #include "mjx/internal/state.h"
 
+#include <optional>
+
 namespace mjx::internal {
 class GameResultSummarizer {
  public:

include/mjx/internal/hand.cpp

@@ -8,6 +8,7 @@
 #include <numeric>
 #include <unordered_map>
 #include <utility>
+#include <optional>
 
 #include "mjx/internal/open.h"
 #include "mjx/internal/utils.h"

include/mjx/internal/hand.h

@@ -6,6 +6,7 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
+#include <optional>
 
 #include "mjx/internal/open.h"
 #include "mjx/internal/tile.h"

include/mjx/internal/observation.cpp

@@ -5,6 +5,8 @@
 #include "mjx/internal/utils.h"
 #include "mjx/internal/yaku_evaluator.h"
 
+#include <optional>
+
 namespace mjx::internal {
 Observation::Observation(const mjxproto::Observation &proto) : proto_(proto) {}
 

include/mjx/internal/observation.h

@@ -3,6 +3,7 @@
 
 #include <array>
 #include <utility>
+#include <optional>
 
 #include "mjx/internal/action.h"
 #include "mjx/internal/hand.h"

include/mjx/internal/state.cpp

@@ -4,6 +4,7 @@
 #include <google/protobuf/util/message_differencer.h>
 
 #include "mjx/internal/utils.h"
+#include <optional>
 
 namespace mjx::internal {
 State::State(State::ScoreInfo score_info)

include/mjx/internal/state.h

@@ -10,6 +10,7 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <optional>
 
 #include "mjx/internal/action.h"
 #include "mjx/internal/consts.h"

include/mjx/internal/win_info.h

@@ -4,6 +4,7 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
+#include <optional>
 
 #include "mjx/internal/open.h"
 #include "mjx/internal/tile.h"

include/mjx/internal/win_score.cpp

@@ -1,6 +1,7 @@
 #include "mjx/internal/win_score.h"
 
 #include <utility>
+#include <optional>
 
 #include "mjx/internal/types.h"
 

include/mjx/internal/win_score.h

@@ -4,6 +4,7 @@
 #include <array>
 #include <map>
 #include <utility>
+#include <optional>
 
 #include "mjx/internal/types.h"
 

include/mjx/internal/yaku_evaluator.cpp

@@ -3,6 +3,7 @@
 #include <cassert>
 #include <tuple>
 #include <vector>
+#include <optional>
 
 #include "mjx/internal/types.h"
 #include "mjx/internal/utils.h"

include/mjx/internal/yaku_evaluator.h

@@ -4,6 +4,7 @@
 #include <tuple>
 #include <unordered_set>
 #include <vector>
+#include <optional>
 
 #include "mjx/internal/types.h"
 #include "mjx/internal/win_cache.h"

mjx/pybind.cpp

@@ -4,6 +4,8 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
+#include <optional>
+
 namespace py = pybind11;
 
 // [references]

requirements-dev.txt

@@ -1,4 +1,4 @@
-grpcio-tools==1.39.0
+grpcio-tools==1.49.1
 pytest
 black
 blackdoc

requirements.txt

@@ -1,6 +1,6 @@
 google==3.0.0
 protobuf==3.17.3
-grpcio==1.39.0
+grpcio==1.49.1
 numpy
 pillow
 svgwrite

setup.py

@@ -154,7 +154,7 @@ def build_extension(self, ext):
     install_requires=[
         "google==3.0.0",
         "protobuf==3.17.3",
-        "grpcio==1.39.0",
+        "grpcio==1.49.1",
         "numpy",
         "pillow",
         "svgwrite",

tests_cpp/internal_hand_test.cpp

@@ -2,6 +2,7 @@
 #include <mjx/internal/tile.h>
 
 #include <array>
+#include <optional>
 
 #include "gtest/gtest.h"
 

tests_cpp/internal_win_score_test.cpp

@@ -1,6 +1,7 @@
 #include <mjx/internal/win_score.h>
 
 #include "gtest/gtest.h"
+#include <optional>
 
 using namespace mjx::internal;
 

tests_cpp/internal_yaku_evaluator_test.cpp

@@ -4,6 +4,8 @@
 
 #include "gtest/gtest.h"
 
+#include <optional>
+
 using namespace mjx::internal;
 
 class YakuTest : public ::testing::Test {