Move protos/ to subdir in optic/

build_defs/BUILD

@@ -14,7 +14,7 @@ package(default_visibility = ["//visibility:private"])
 proto_lang_toolchain(
     name = "python_toolchain",
     command_line = "--python_out=%s",
-    plugin = "//protos/bin:protoc_gen_mypy",
+    plugin = "//optic/protos/bin:protoc_gen_mypy",
     plugin_format_flag = "--plugin=protoc-gen-mypy=%s",
     progress_message = "Generating Python proto_library %{label}",
     runtime = "@com_google_protobuf//:protobuf_python",

optic/cli/cli.py

@@ -1,7 +1,7 @@
 from absl import app
 from absl import flags
 
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 from optic.cli.execute_module import execute_module
 from optic.exceptions import format_traceback
 

optic/cli/dev_cli.py

@@ -1,7 +1,7 @@
 from absl import app
 from absl import flags
 
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 from optic.cli.execute_module import execute_module
 from optic.exceptions import format_traceback
 

optic/component_helpers/BUILD

@@ -8,7 +8,7 @@ py_library(
     name = "component_helpers",
     srcs = glob(["*.py"]),
     deps = [
+        "//optic/protos:ui_py_pb2",
         "//optic/runtime",
-        "//protos:ui_py_pb2",
     ],
 )

optic/component_helpers/helper.py

@@ -2,7 +2,7 @@
 from optic.runtime import runtime
 from optic.events import OpticEvent
 from optic.key import Key
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 
 
 class ComponentWithChildren:

optic/components/box/box.py

@@ -1,6 +1,6 @@
 from pydantic import validate_arguments
 
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 import optic.components.box.box_pb2 as box_pb
 from optic.component_helpers import ComponentWithChildren
 

optic/components/box/box.ts

@@ -8,7 +8,7 @@ import {
   Key,
   Type,
   UserEvent,
-} from "optic/protos/ui_jspb_proto_pb/protos/ui_pb";
+} from "optic/optic/protos/ui_jspb_proto_pb/optic/protos/ui_pb";
 import { BoxType } from "optic/optic/components/box/box_jspb_proto_pb/optic/components/box/box_pb";
 import { Channel } from "../../../web/src/services/channel";
 

optic/components/button/button.py

@@ -1,7 +1,7 @@
 from pydantic import validate_arguments
 
 from typing import Any, Callable
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 import optic.components.button.button_pb2 as button_pb
 from optic.component_helpers import insert_component, handler_type
 from optic.events import ClickEvent

optic/components/button/button.ts

@@ -3,7 +3,7 @@ import {
   Key,
   Type,
   UserEvent,
-} from "optic/protos/ui_jspb_proto_pb/protos/ui_pb";
+} from "optic/optic/protos/ui_jspb_proto_pb/optic/protos/ui_pb";
 import { ButtonType } from "optic/optic/components/button/button_jspb_proto_pb/optic/components/button/button_pb";
 import { Channel } from "../../../web/src/services/channel";
 import { MatButtonModule } from "@angular/material/button";

optic/components/checkbox/checkbox.py

@@ -2,7 +2,7 @@
 from pydantic import validate_arguments
 
 from typing import Any, Callable
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 import optic.components.checkbox.checkbox_pb2 as checkbox_pb
 from optic.component_helpers import (
     insert_component,

optic/components/checkbox/checkbox.ts

@@ -3,7 +3,7 @@ import {
   Key,
   Type,
   UserEvent,
-} from "optic/protos/ui_jspb_proto_pb/protos/ui_pb";
+} from "optic/optic/protos/ui_jspb_proto_pb/optic/protos/ui_pb";
 import { CheckboxType } from "optic/optic/components/checkbox/checkbox_jspb_proto_pb/optic/components/checkbox/checkbox_pb";
 import { Channel } from "../../../web/src/services/channel";
 

optic/components/defs.bzl

@@ -25,7 +25,7 @@ def optic_component(name, ng_deps = [], py_deps = []):
         ]),
         deps = [
             ":" + jspb_proto_target,
-            "//protos:ui_jspb_proto",
+            "//optic/protos:ui_jspb_proto",
             "//web/src/services",
         ] + ANGULAR_CORE_DEPS + ANGULAR_MATERIAL_TS_DEPS + ng_deps,
     )
@@ -37,7 +37,7 @@ def optic_component(name, ng_deps = [], py_deps = []):
             ":" + py_proto_target,
             "//optic/component_helpers",
             "//optic/events",
-            "//protos:ui_py_pb2",
+            "//optic/protos:ui_py_pb2",
         ] + THIRD_PARTY_PY_PYDANTIC + py_deps,
     )
 

optic/components/text/text.py

@@ -1,6 +1,6 @@
 from pydantic import validate_arguments
 
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 import optic.components.text.text_pb2 as text_pb2
 from optic.component_helpers import insert_component
 

optic/components/text/text.ts

@@ -1,5 +1,8 @@
 import { ChangeDetectionStrategy, Component, Input } from "@angular/core";
-import { Key, Type } from "optic/protos/ui_jspb_proto_pb/protos/ui_pb";
+import {
+  Key,
+  Type,
+} from "optic/optic/protos/ui_jspb_proto_pb/optic/protos/ui_pb";
 import { TextType } from "optic/optic/components/text/text_jspb_proto_pb/optic/components/text/text_pb";
 
 @Component({

optic/components/text_input/text_input.py

@@ -1,7 +1,7 @@
 from pydantic import validate_arguments
 
 from typing import Any, Callable
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 import optic.components.text_input.text_input_pb2 as text_input_pb
 from optic.component_helpers import insert_component, handler_type
 from optic.events import ChangeEvent

optic/components/text_input/text_input.ts

@@ -3,7 +3,7 @@ import {
   Key,
   Type,
   UserEvent,
-} from "optic/protos/ui_jspb_proto_pb/protos/ui_pb";
+} from "optic/optic/protos/ui_jspb_proto_pb/optic/protos/ui_pb";
 import { TextInputType } from "optic/optic/components/text_input/text_input_jspb_proto_pb/optic/components/text_input/text_input_pb";
 import { Channel } from "../../../web/src/services/channel";
 import { MatFormFieldModule } from "@angular/material/form-field";

optic/event_handler/BUILD

@@ -10,7 +10,7 @@ py_library(
     deps = [
         "//optic/component_helpers",
         "//optic/events",
+        "//optic/protos:ui_py_pb2",
         "//optic/runtime",
-        "//protos:ui_py_pb2",
     ],
 )

optic/event_handler/event_handler.py

@@ -5,7 +5,7 @@
 import optic.events as events
 from ..component_helpers.helper import get_qualified_fn_name
 from optic.runtime import runtime
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 
 E = TypeVar("E", bound=events.OpticEvent)
 Handler = Callable[[E], None | Generator[None, None, None]]

optic/exceptions/format_traceback.py

@@ -2,7 +2,7 @@
 import sys
 import linecache
 
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 
 
 def format_traceback(lines_before: int = 2, lines_after: int = 4) -> pb.Traceback:

optic/key/BUILD

@@ -8,6 +8,6 @@ py_library(
     name = "key",
     srcs = glob(["*.py"]),
     deps = [
-        "//protos:ui_py_pb2",
+        "//optic/protos:ui_py_pb2",
     ],
 )

optic/key/key.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 
 
 @dataclass

optic/runtime/BUILD

@@ -10,6 +10,6 @@ py_library(
     deps = [
         "//optic/dataclass_utils",
         "//optic/exceptions",
-        "//protos:ui_py_pb2",
+        "//optic/protos:ui_py_pb2",
     ],
 )

optic/runtime/context.py

@@ -1,7 +1,7 @@
 from dataclasses import asdict, is_dataclass
 import json
 from typing import Any, Callable, Generator, TypeVar, cast
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 from optic.dataclass_utils import update_dataclass_from_json
 
 T = TypeVar("T")

optic/runtime/runtime.py

@@ -3,7 +3,7 @@
 
 from optic.key import Key
 from optic.events import OpticEvent
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 from .context import Context
 from optic.exceptions import OpticUserException
 

optic/server/BUILD

@@ -8,7 +8,7 @@ py_library(
     name = "server",
     srcs = glob(["*.py"]),
     deps = [
-        "//protos:ui_py_pb2",
+        "//optic/protos:ui_py_pb2",
     ] + PYTHON_RUNFILES_DEP + THIRD_PARTY_PY_FLASK,
     # Note: prod_server.py has a runtime dependency on
     # //web/src/app/prod:web_package, so you must include it

optic/server/server.py

@@ -3,7 +3,7 @@
 
 from flask import Flask, Response, request
 
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 
 from optic.runtime import runtime
 from optic.exceptions import format_traceback

scripts/component_template/component_name.py

@@ -1,7 +1,7 @@
 from pydantic import validate_arguments
 
 from typing import Any, Callable
-import protos.ui_pb2 as pb
+import optic.protos.ui_pb2 as pb
 import optic.components.component_name.component_name_pb2 as component_name_pb
 from optic.component_helpers import insert_component, handler_type
 from optic.events import ClickEvent

scripts/component_template/component_name.ts

@@ -4,7 +4,7 @@ import {
   Key,
   Type,
   UserEvent,
-} from "optic/protos/ui_jspb_proto_pb/protos/ui_pb";
+} from "optic/optic/protos/ui_jspb_proto_pb/optic/protos/ui_pb";
 import { ComponentNameType } from "optic/optic/components/component_name/component_name_jspb_proto_pb/optic/components/component_name/component_name_pb";
 import { Channel } from "../../../web/src/services/channel";
 

scripts/setup_proto_py_modules.sh

@@ -1,7 +1,7 @@
 # Needed for VS Code to provide Python type-checking against generated proto stubs.
 bazel_bin_path=$(bazel info bazel-bin)
 
-touch "${bazel_bin_path}/protos/__init__.py" && \
 touch "${bazel_bin_path}/optic/__init__.py" && \
+touch "${bazel_bin_path}/optic/protos/__init__.py" && \
 touch "${bazel_bin_path}/optic/components/__init__.py" &&
 find "${bazel_bin_path}/optic/components/" -type d -exec touch {}/__init__.py \;

web/src/app/BUILD

@@ -13,7 +13,7 @@ ng_module(
         "app.ng.html",
     ],
     deps = [
-        "//protos:ui_jspb_proto",
+        "//optic/protos:ui_jspb_proto",
         "//web/src/component_renderer",
         "//web/src/dev_tools",
         "//web/src/error",

web/src/app/app.ts

@@ -6,7 +6,7 @@ import {
   ViewChild,
 } from "@angular/core";
 import { MatProgressBarModule } from "@angular/material/progress-bar";
-import * as pb from "optic/protos/ui_jspb_proto_pb/protos/ui_pb";
+import * as pb from "optic/optic/protos/ui_jspb_proto_pb/optic/protos/ui_pb";
 import { CommonModule } from "@angular/common";
 import { ComponentRenderer } from "../component_renderer/component_renderer";
 import { Channel, ChannelStatus } from "../services/channel";

web/src/component_renderer/BUILD

@@ -19,6 +19,6 @@ ng_module(
         "//optic/components/button:ng",
         "//optic/components/checkbox:ng",
         "//optic/components/text:ng",
-        "//protos:ui_jspb_proto",
+        "//optic/protos:ui_jspb_proto",
     ] + ANGULAR_CORE_DEPS,
 )

web/src/component_renderer/component_renderer.ts

@@ -1,6 +1,6 @@
 import { Component, Input } from "@angular/core";
 import { CommonModule } from "@angular/common";
-import * as pb from "optic/protos/ui_jspb_proto_pb/protos/ui_pb";
+import * as pb from "optic/optic/protos/ui_jspb_proto_pb/optic/protos/ui_pb";
 import { CheckboxComponent } from "../../../optic/components/checkbox/checkbox";
 import { ButtonComponent } from "../../../optic/components/button/button";
 import { TextComponent } from "../../../optic/components/text/text";

web/src/dev_tools/BUILD

@@ -13,7 +13,7 @@ ng_module(
         "*.ng.html",
     ]) + [":dev_tools.css"],
     deps = [
-        "//protos:ui_jspb_proto",
+        "//optic/protos:ui_jspb_proto",
         "//web/src/dev_tools/components_panel",
         "//web/src/dev_tools/logs_panel",
     ] + ANGULAR_CORE_DEPS,

web/src/dev_tools/component_tree/BUILD

@@ -13,7 +13,7 @@ ng_module(
         "*.ng.html",
     ]) + [":component_tree.css"],
     deps = [
-        "//protos:ui_jspb_proto",
+        "//optic/protos:ui_jspb_proto",
         "//web/src/component_renderer",
         "//web/src/services",
     ] + ANGULAR_CORE_DEPS,

web/src/dev_tools/components_panel/BUILD

@@ -13,7 +13,7 @@ ng_module(
         "*.ng.html",
     ]) + [":components_panel.css"],
     deps = [
-        "//protos:ui_jspb_proto",
+        "//optic/protos:ui_jspb_proto",
         "//web/src/dev_tools/component_tree",
         "//web/src/dev_tools/object_tree",
         "//web/src/services",

web/src/dev_tools/logs_panel/BUILD

@@ -13,7 +13,7 @@ ng_module(
         "*.ng.html",
     ]) + [":logs_panel.css"],
     deps = [
-        "//protos:ui_jspb_proto",
+        "//optic/protos:ui_jspb_proto",
         "//web/src/component_renderer",
         "//web/src/dev_tools/object_tree",
         "//web/src/services",

web/src/dev_tools/object_tree/BUILD

@@ -13,7 +13,7 @@ ng_module(
         "*.ng.html",
     ]) + [":object_tree.css"],
     deps = [
-        "//protos:ui_jspb_proto",
+        "//optic/protos:ui_jspb_proto",
         "//web/src/component_renderer",
         "//web/src/services",
     ] + ANGULAR_CORE_DEPS,

web/src/dev_tools/services/BUILD

@@ -16,6 +16,6 @@ ng_module(
         "//optic/components/checkbox:checkbox_jspb_proto",
         "//optic/components/text:text_jspb_proto",
         "//optic/components/text_input:text_input_jspb_proto",
-        "//protos:ui_jspb_proto",
+        "//optic/protos:ui_jspb_proto",
     ] + ANGULAR_CORE_DEPS,
 )

web/src/dev_tools/services/logger.ts

@@ -1,5 +1,5 @@
 import { Injectable } from "@angular/core";
-import * as pb from "optic/protos/ui_jspb_proto_pb/protos/ui_pb";
+import * as pb from "optic/optic/protos/ui_jspb_proto_pb/optic/protos/ui_pb";
 import { TypeDeserializer } from "./type_deserializer";
 import { Observable, Subject } from "rxjs";
 

web/src/error/BUILD

@@ -13,7 +13,7 @@ ng_module(
         "*.ng.html",
     ]) + [":error_box.css"],
     deps = [
-        "//protos:ui_jspb_proto",
+        "//optic/protos:ui_jspb_proto",
         "//web/src/component_renderer",
         "//web/src/services",
     ] + ANGULAR_CORE_DEPS,

web/src/error/error_box.ts

@@ -1,6 +1,6 @@
 import { Component, Input } from "@angular/core";
 import { MatProgressBarModule } from "@angular/material/progress-bar";
-import * as pb from "optic/protos/ui_jspb_proto_pb/protos/ui_pb";
+import * as pb from "optic/optic/protos/ui_jspb_proto_pb/optic/protos/ui_pb";
 import { CommonModule } from "@angular/common";
 import { ComponentRenderer } from "../component_renderer/component_renderer";
 import { Channel } from "../services/channel";

web/src/services/BUILD

@@ -10,7 +10,7 @@ ng_module(
         "*.ts",
     ]),
     deps = [
-        "//protos:ui_jspb_proto",
+        "//optic/protos:ui_jspb_proto",
         "//web/src/dev_tools/services",
     ] + ANGULAR_CORE_DEPS,
 )

web/src/services/channel.ts

@@ -1,5 +1,5 @@
 import { Injectable, NgZone } from "@angular/core";
-import * as pb from "optic/protos/ui_jspb_proto_pb/protos/ui_pb";
+import * as pb from "optic/optic/protos/ui_jspb_proto_pb/optic/protos/ui_pb";
 import { Logger } from "../dev_tools/services/logger";
 
 const anyWindow = window as any;