pyre-check-nightly 0.0.101730027570__py3-none-macosx_10_11_x86_64.whl → 0.0.101730200318__py3-none-macosx_10_11_x86_64.whl

pyre_check/__init__.py

@@ -3,4 +3,4 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-__version__ = "0.0.101730027570"
+__version__ = "0.0.101730200318"

pyre_check/client/backend_arguments.py

@@ -114,6 +114,7 @@ class BuckSourcePath:
     mode: Optional[str] = None
     isolation_prefix: Optional[str] = None
     bxl_builder: Optional[str] = None
+    use_buck2: bool = True
 
     def serialize(self) -> Dict[str, object]:
         mode = self.mode
@@ -140,6 +141,7 @@ class BuckSourcePath:
                 else {"isolation_prefix": isolation_prefix}
             ),
             **({} if bxl_builder is None else {"bxl_builder": bxl_builder}),
+            "use_buck2": self.use_buck2,
             "source_root": str(self.source_root),
             "artifact_root": str(self.artifact_root),
         }
@@ -280,6 +282,15 @@ def find_watchman_root(
     )
 
 
+def find_buck_root(
+    base: Path,
+    stop_search_after: Optional[int] = None,
+) -> Optional[Path]:
+    return find_directories.find_parent_directory_containing_file(
+        base, ".buckconfig", stop_search_after
+    )
+
+
 def find_buck2_root(
     base: Path,
     stop_search_after: Optional[int] = None,
@@ -340,8 +351,11 @@ def get_source_path(
         )
 
     if targets is not None:
+        use_buck2 = configuration.uses_buck2()
         search_base = _get_global_or_local_root(configuration)
-        source_root = find_buck2_root(search_base)
+        source_root = (
+            find_buck2_root(search_base) if use_buck2 else find_buck_root(search_base)
+        )
         if source_root is None:
             raise configuration_module.InvalidConfiguration(
                 "Cannot find a buck root for the specified targets. "
@@ -359,6 +373,7 @@ def get_source_path(
             mode=buck_mode,
             isolation_prefix=configuration.get_buck_isolation_prefix(),
             bxl_builder=configuration.get_buck_bxl_builder(),
+            use_buck2=use_buck2,
         )
 
     raise configuration_module.InvalidConfiguration(

pyre_check/client/command_arguments.py

@@ -118,6 +118,7 @@ class CommandArguments:
     shared_memory_dependency_table_power: Optional[int] = None
     shared_memory_hash_table_power: Optional[int] = None
     number_of_workers: Optional[int] = None
+    use_buck2: Optional[bool] = None
     enable_unawaited_awaitable_analysis: Optional[bool] = None
     include_suppressed_errors: Optional[bool] = None
 

pyre_check/client/commands/pyre_language_server.py

@@ -145,13 +145,18 @@ class BuckTypeCheckStatus(enum.Enum):
     PARSE_ERROR = "parse_error"
     NOT_RUN = "not_run"
     PREEMPTED = "preempted"
+    PREEMPTED_SHOULD_RETRY = "preempted_should_retry"
 
     @classmethod
-    def from_returncode(cls, returncode: Optional[int]) -> BuckTypeCheckStatus:
+    def from_returncode(
+        cls, returncode: Optional[int], remaining_tasks: Optional[int] = None
+    ) -> BuckTypeCheckStatus:
         if returncode == 0:
             return BuckTypeCheckStatus.SUCCESS
         elif returncode == 3:
             return BuckTypeCheckStatus.USER_ERROR
+        elif returncode == 5 and remaining_tasks == 0:
+            return BuckTypeCheckStatus.PREEMPTED_SHOULD_RETRY
         elif returncode == 5:
             return BuckTypeCheckStatus.PREEMPTED
         else:
@@ -498,7 +503,7 @@ def log_exceptions_factory(
     return log_exceptions
 
 
-@dataclasses.dataclass(frozen=True)
+@dataclasses.dataclass
 class PyreLanguageServer(PyreLanguageServerApi):
     # Channel to send responses to the editor
     output_channel: connections.AsyncTextWriter
@@ -511,6 +516,7 @@ class PyreLanguageServer(PyreLanguageServerApi):
     index_querier: daemon_querier.AbstractDaemonQuerier
     document_formatter: Optional[AbstractDocumentFormatter]
     client_type_error_handler: type_error_handler.ClientTypeErrorHandler
+    ongoing_type_checks: int = 0
 
     async def write_telemetry(
         self,
@@ -724,14 +730,20 @@ class PyreLanguageServer(PyreLanguageServerApi):
                 file=argfile,
             )
             argfile.flush()
+            if (
+                self.get_language_server_features().type_errors_preemptible.is_enabled()
+                or self.get_language_server_features().per_target_isolation_dir.is_disabled()
+            ):
+                preemptible = [
+                    "--preemptible=ondifferentstate",
+                ]
+            else:
+                preemptible = []
             if self.get_language_server_features().per_target_isolation_dir.is_enabled():
                 isolation_dir = [f"--isolation-dir={PTT_ISOLATION_PREFIX}"]
-                preemptible = []
             else:
                 isolation_dir = []
-                preemptible = [
-                    "--preemptible=ondifferentstate",
-                ]
+
             type_check_parameters = [
                 "buck2",
                 *isolation_dir,
@@ -747,12 +759,16 @@ class PyreLanguageServer(PyreLanguageServerApi):
             LOG.debug(
                 f"Querying Buck for type errors: `{' '.join(type_check_parameters)}`"
             )
+
+            self.ongoing_type_checks += 1
             type_check = await asyncio.create_subprocess_exec(
                 *type_check_parameters,
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
             )
             stdout_data, stderr_data = await type_check.communicate()
+            self.ongoing_type_checks -= 1
+
             stdout_text = stdout_data.decode("utf-8")
             stderr_text = stderr_data.decode("utf-8")
             LOG.debug(f"Buck type check results:\n{stdout_text}\n{stderr_text}")
@@ -762,14 +778,20 @@ class PyreLanguageServer(PyreLanguageServerApi):
 
         error_message = None
         # return now if buck build was unsuccessful or not preempted
-        if type_check.returncode != 0:
-            if type_check.returncode != 5:
+        result_status = BuckTypeCheckStatus.from_returncode(
+            type_check.returncode, remaining_tasks=self.ongoing_type_checks
+        )
+        if result_status != BuckTypeCheckStatus.SUCCESS:
+            if result_status not in (
+                BuckTypeCheckStatus.PREEMPTED,
+                BuckTypeCheckStatus.PREEMPTED_SHOULD_RETRY,
+            ):
                 error_message = (
                     f"Got error exit code from Buck type check: {stderr_text}"
                 )
                 LOG.error(error_message)
             return PyreBuckTypeErrorMetadata(
-                status=BuckTypeCheckStatus.from_returncode(type_check.returncode),
+                status=result_status,
                 duration=buck_query_timer.stop_in_millisecond(),
                 type_errors={},
                 build_id=build_id,
@@ -822,7 +844,7 @@ class PyreLanguageServer(PyreLanguageServerApi):
             result = await self._query_buck_for_type_errors(
                 type_checkable_files, buck_query_timer, retries=retries
             )
-            if result.status != BuckTypeCheckStatus.PREEMPTED:
+            if result.status != BuckTypeCheckStatus.PREEMPTED_SHOULD_RETRY:
                 return result
 
         LOG.warning(
@@ -893,15 +915,17 @@ class PyreLanguageServer(PyreLanguageServerApi):
             LOG.debug(
                 f"Getting files for type checker from Buck: `{' '.join(query_parameters)}`"
             )
-            type_checked_files_query = asyncio.create_subprocess_exec(
+
+            self.ongoing_type_checks += 1
+            type_checked_files_query = await asyncio.create_subprocess_exec(
                 *query_parameters,
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
             )
-            awaited_files_query = await type_checked_files_query
-            stdout_data, stderr_data = await awaited_files_query.communicate()
+            stdout_data, stderr_data = await type_checked_files_query.communicate()
+            self.ongoing_type_checks -= 1
 
-        if awaited_files_query.returncode != 0:
+        if type_checked_files_query.returncode != 0:
             stderr = stderr_data.decode("utf-8")
             message = f"Typing query ended in error: {stderr}"
             LOG.error(message)
@@ -998,6 +1022,10 @@ class PyreLanguageServer(PyreLanguageServerApi):
                     "new_file_loaded": new_file_loaded,
                     "isolation_dir": isolation_dir,
                     "sharding_enabled": self.get_language_server_features().type_error_sharding.is_enabled(),
+                    "preemptible": (
+                        self.get_language_server_features().type_errors_preemptible.is_enabled()
+                        or self.get_language_server_features().per_target_isolation_dir.is_disabled()
+                    ),
                 },
                 **daemon_status_before.as_telemetry_dict(),
             },
@@ -1723,12 +1751,13 @@ class PyreLanguageServer(PyreLanguageServerApi):
             )
 
         try:
-            if self.document_formatter is None:
+            document_formatter = self.document_formatter
+            if document_formatter is None:
                 raise json_rpc.InternalError("Formatter was not initialized correctly.")
             else:
                 document_formatter_timer = timer.Timer()
-                document_formatting_response = (
-                    await self.document_formatter.format_document(document_path)
+                document_formatting_response = await document_formatter.format_document(
+                    document_path
                 )
 
                 raw_results = lsp.DocumentFormattingResponse.cached_schema().dump(
@@ -2307,7 +2336,7 @@ class PyreLanguageServer(PyreLanguageServerApi):
         )
 
 
-@dataclasses.dataclass(frozen=True)
+@dataclasses.dataclass
 class CodeNavigationServerApi(PyreLanguageServer):
     pass
 

pyre_check/client/configuration/configuration.py

@@ -166,6 +166,7 @@ class PartialConfiguration:
     )
     typeshed: Optional[str] = None
     unwatched_dependency: Optional[unwatched.UnwatchedDependency] = None
+    use_buck2: Optional[bool] = None
     version_hash: Optional[str] = None
     use_errpy_parser: Optional[bool] = None
 
@@ -244,6 +245,7 @@ class PartialConfiguration:
             targets=targets,
             typeshed=arguments.typeshed,
             unwatched_dependency=None,
+            use_buck2=arguments.use_buck2,
             version_hash=None,
         )
 
@@ -484,6 +486,7 @@ class PartialConfiguration:
                 targets=ensure_optional_string_list(configuration_json, "targets"),
                 typeshed=ensure_option_type(configuration_json, "typeshed", str),
                 unwatched_dependency=unwatched_dependency,
+                use_buck2=ensure_option_type(configuration_json, "use_buck2", bool),
                 version_hash=ensure_option_type(configuration_json, "version", str),
                 use_errpy_parser=ensure_option_type(
                     configuration_json, "use_errpy_parser", bool
@@ -616,6 +619,7 @@ class Configuration:
     targets: Optional[Sequence[str]] = None
     typeshed: Optional[str] = None
     unwatched_dependency: Optional[unwatched.UnwatchedDependency] = None
+    use_buck2: bool = True
     version_hash: Optional[str] = None
     use_errpy_parser: bool = False
 
@@ -678,6 +682,9 @@ class Configuration:
             targets=partial_configuration.targets,
             typeshed=partial_configuration.typeshed,
             unwatched_dependency=partial_configuration.unwatched_dependency,
+            use_buck2=_get_optional_value(
+                partial_configuration.use_buck2, default=True
+            ),
             version_hash=partial_configuration.version_hash,
             use_errpy_parser=_get_optional_value(
                 partial_configuration.use_errpy_parser, default=False
@@ -808,6 +815,7 @@ class Configuration:
                 if unwatched_dependency is not None
                 else {}
             ),
+            "use_buck2": self.use_buck2,
             **({"version_hash": version_hash} if version_hash is not None else {}),
         }
 

pyre_check/client/frontend_configuration.py

@@ -171,6 +171,10 @@ class Base(abc.ABC):
     ) -> Optional[List[str]]:
         raise NotImplementedError()
 
+    @abc.abstractmethod
+    def uses_buck2(self) -> bool:
+        raise NotImplementedError()
+
     @abc.abstractmethod
     def get_buck_mode(self) -> Optional[str]:
         raise NotImplementedError()
@@ -379,6 +383,9 @@ class OpenSource(Base):
         targets = self.configuration.targets
         return list(targets) if targets is not None else None
 
+    def uses_buck2(self) -> bool:
+        return self.configuration.use_buck2
+
     def get_buck_mode(self) -> Optional[str]:
         mode = self.configuration.buck_mode
         return mode.get() if mode is not None else None

pyre_check/client/language_server/features.py

@@ -100,6 +100,7 @@ FormattingAvailability = _Availability
 PerTargetTypeErrorsAvailability = CustomAvailability
 PerTargetIsolationDirAvailability = CustomAvailability
 TypeErrorShardingAvailability = CustomAvailability
+TypeErrorsPreemptibleAvailability = CustomAvailability
 PythonAutoTargetsAvailability = CustomAvailability
 SystemPyAutoTargetsAvailability = CustomAvailability
 # TODO: T204372341 remove this once we have rolled out addition and removal features
@@ -127,6 +128,9 @@ class LanguageServerFeatures:
     type_error_sharding: TypeErrorShardingAvailability = (
         TypeErrorShardingAvailability.from_enabled(False)
     )
+    type_errors_preemptible: TypeErrorsPreemptibleAvailability = (
+        TypeErrorsPreemptibleAvailability.from_enabled(False)
+    )
     unsaved_changes: UnsavedChangesAvailability = UnsavedChangesAvailability.DISABLED
     telemetry: TelemetryAvailability = TelemetryAvailability.DISABLED
     completion: CompletionAvailability = CompletionAvailability.DISABLED

pyre_check/client/pyre.py

@@ -397,6 +397,7 @@ def pyre(
         shared_memory_dependency_table_power=shared_memory_dependency_table_power,
         shared_memory_hash_table_power=shared_memory_hash_table_power,
         number_of_workers=number_of_workers,
+        use_buck2=None,
     )
     context.ensure_object(dict)
     context.obj["arguments"] = arguments

pyre_check/client/version.py

@@ -1 +1 @@
-__version__ = "0.0.101730027570"
+__version__ = "0.0.101730200318"

{pyre_check_nightly-0.0.101730027570.dist-info → pyre_check_nightly-0.0.101730200318.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyre-check-nightly
-Version: 0.0.101730027570
+Version: 0.0.101730200318
 Summary: A performant type checker for Python
 Home-page: https://pyre-check.org/
 Download-URL: https://github.com/facebook/pyre-check