tensorgrid-platform 1.19.2__tar.gz → 1.19.4__tar.gz

{tensorgrid_platform-1.19.2 → tensorgrid_platform-1.19.4}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: tensorgrid-platform
-Version: 1.19.2
-Summary: TensorGrid: multimodal data platform for building high-quality datasets and computer vision models (derived from FiftyOne)
+Version: 1.19.4
+Summary: TensorGrid: multimodal data platform for building high-quality datasets and computer vision models
 Home-page: https://github.com/rksaklani/TensorGrid
 Author: TensorGrid Contributors
 Author-email: 
@@ -93,8 +93,6 @@ Dynamic: summary
 
 **Multimodal data platform for building high-quality datasets and computer vision models.**
 
-Derived from [FiftyOne](https://github.com/voxel51/fiftyone) (Apache 2.0). See [NOTICE](https://github.com/rksaklani/TensorGrid/blob/main/NOTICE) for attribution.
-
 [![PyPI version](https://badge.fury.io/py/tensorgrid-platform.svg)](https://pypi.org/project/tensorgrid-platform/)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/rksaklani/TensorGrid/blob/main/core/LICENSE)
 [![Python](https://img.shields.io/pypi/pyversions/tensorgrid-platform)](https://pypi.org/project/tensorgrid-platform/)
@@ -109,7 +107,7 @@ Derived from [FiftyOne](https://github.com/voxel51/fiftyone) (Apache 2.0). See [
 pip install tensorgrid-platform
 ```
 
-`fiftyone-db` and `fiftyone-brain` are installed automatically as dependencies.
+Requires Python 3.10+.
 
 ## Quick start
 
@@ -131,13 +129,6 @@ tg app launch quickstart
 tensorgrid app launch quickstart
 ```
 
-## Python API
-
-```python
-import tensorgrid as tg          # recommended
-import fiftyone as fo            # compatibility alias
-```
-
 ## Development install
 
 Clone the [GitHub repository](https://github.com/rksaklani/TensorGrid), build the web app, then:
@@ -149,4 +140,4 @@ pip install -e core/
 
 ## License
 
-Apache 2.0. TensorGrid modifications © TensorGrid Contributors. Original FiftyOne © Voxel51, Inc.
+Apache 2.0. See [NOTICE](https://github.com/rksaklani/TensorGrid/blob/main/NOTICE) for attribution.

{tensorgrid_platform-1.19.2 → tensorgrid_platform-1.19.4}/README.md

@@ -2,8 +2,6 @@
 
 **Multimodal data platform for building high-quality datasets and computer vision models.**
 
-Derived from [FiftyOne](https://github.com/voxel51/fiftyone) (Apache 2.0). See [NOTICE](https://github.com/rksaklani/TensorGrid/blob/main/NOTICE) for attribution.
-
 [![PyPI version](https://badge.fury.io/py/tensorgrid-platform.svg)](https://pypi.org/project/tensorgrid-platform/)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/rksaklani/TensorGrid/blob/main/core/LICENSE)
 [![Python](https://img.shields.io/pypi/pyversions/tensorgrid-platform)](https://pypi.org/project/tensorgrid-platform/)
@@ -18,7 +16,7 @@ Derived from [FiftyOne](https://github.com/voxel51/fiftyone) (Apache 2.0). See [
 pip install tensorgrid-platform
 ```
 
-`fiftyone-db` and `fiftyone-brain` are installed automatically as dependencies.
+Requires Python 3.10+.
 
 ## Quick start
 
@@ -40,13 +38,6 @@ tg app launch quickstart
 tensorgrid app launch quickstart
 ```
 
-## Python API
-
-```python
-import tensorgrid as tg          # recommended
-import fiftyone as fo            # compatibility alias
-```
-
 ## Development install
 
 Clone the [GitHub repository](https://github.com/rksaklani/TensorGrid), build the web app, then:
@@ -58,4 +49,4 @@ pip install -e core/
 
 ## License
 
-Apache 2.0. TensorGrid modifications © TensorGrid Contributors. Original FiftyOne © Voxel51, Inc.
+Apache 2.0. See [NOTICE](https://github.com/rksaklani/TensorGrid/blob/main/NOTICE) for attribution.

{tensorgrid_platform-1.19.2 → tensorgrid_platform-1.19.4}/fiftyone/core/service.py

@@ -10,6 +10,7 @@ import logging
 import os
 import subprocess
 import sys
+import time
 
 import psutil
 import requests
@@ -317,6 +318,26 @@ class ServerService(Service):
         except:
             server_version = None
 
+        if server_version is not None and server_version != foc.VERSION:
+            is_local = address in ("127.0.0.1", "localhost", "::1", "0.0.0.0")
+            if is_local:
+                logger.warning(
+                    "Stale TensorGrid server v%s on port %i (client is v%s); "
+                    "restarting",
+                    server_version,
+                    port,
+                    foc.VERSION,
+                )
+                fosu.stop_server_on_port(port, address)
+                time.sleep(1)
+                server_version = None
+            else:
+                logger.warning(
+                    "Remote TensorGrid server v%s does not match client v%s",
+                    server_version,
+                    foc.VERSION,
+                )
+
         if server_version is None:
             # There is likely not a fiftyone server running (remote or local),
             # so start a local server. If there actually is a fiftyone server
@@ -332,12 +353,6 @@ class ServerService(Service):
                 port,
                 address,
             )
-            if server_version != foc.VERSION:
-                logger.warning(
-                    "Server version (%s) does not match client version (%s)",
-                    server_version,
-                    foc.VERSION,
-                )
 
     @property
     def command(self):

{tensorgrid_platform-1.19.2 → tensorgrid_platform-1.19.4}/fiftyone/service/util.py

@@ -102,6 +102,92 @@ def find_processes_by_args(args):
             pass
 
 
+def _address_matches_listener(listener_ip, address):
+    """Returns whether *listener_ip* accepts connections for *address*."""
+    if address is None:
+        return True
+    if listener_ip in ("0.0.0.0", "::", ""):
+        return True
+    if address in ("127.0.0.1", "localhost") and listener_ip in (
+        "127.0.0.1",
+        "::1",
+    ):
+        return True
+    return listener_ip == address
+
+
+def find_processes_listening_on_port(port, address=None):
+    """Finds processes owned by the current user listening on a TCP port.
+
+    Args:
+        port (int): the port number
+        address (None): if specified, only listeners that accept connections on
+            this address are returned
+
+    Returns:
+        generator of psutil.Process objects
+    """
+    current_username = psutil.Process().username()
+    for process in psutil.process_iter(["username"]):
+        try:
+            if process.info["username"] != current_username:
+                continue
+            for conn in process.connections(kind="tcp"):
+                if (
+                    conn.status == psutil.CONN_LISTEN
+                    and conn.laddr.port == port
+                    and _address_matches_listener(conn.laddr.ip, address)
+                ):
+                    yield process
+                    break
+        except (psutil.NoSuchProcess, psutil.AccessDenied):
+            pass
+
+
+def kill_process_tree(process, timeout=5):
+    """Terminates a process and its descendants."""
+    process = normalize_wrapper_process(process)
+    try:
+        children = process.children(recursive=True)
+    except psutil.Error:
+        children = []
+
+    for child in reversed(children):
+        try:
+            child.terminate()
+        except psutil.NoSuchProcess:
+            pass
+
+    try:
+        process.terminate()
+    except psutil.NoSuchProcess:
+        return
+
+    _, alive = psutil.wait_procs([process] + children, timeout=timeout)
+    for proc in alive:
+        try:
+            proc.kill()
+        except psutil.NoSuchProcess:
+            pass
+
+
+def stop_server_on_port(port, address="127.0.0.1"):
+    """Stops TensorGrid server processes bound to the given port.
+
+    Args:
+        port (int): the port number
+        address (str): the server address
+    """
+    killed = set()
+    for process in find_processes_by_args(["main.py", "--port", str(port)]):
+        kill_process_tree(process)
+        killed.add(process.pid)
+
+    for process in find_processes_listening_on_port(port, address):
+        if process.pid not in killed:
+            kill_process_tree(process)
+
+
 def get_listening_tcp_ports(process):
     """Retrieves a list of TCP ports that the specified process is listening on.
 

{tensorgrid_platform-1.19.2 → tensorgrid_platform-1.19.4}/setup.py

@@ -10,7 +10,7 @@ Installs TensorGrid (fork of FiftyOne).
 import os
 from setuptools import setup, find_packages
 
-VERSION = "1.19.2"
+VERSION = "1.19.4"
 
 
 def get_version():
@@ -34,7 +34,7 @@ setup(
     version=get_version(),
     description=(
         "TensorGrid: multimodal data platform for building high-quality "
-        "datasets and computer vision models (derived from FiftyOne)"
+        "datasets and computer vision models"
     ),
     author="TensorGrid Contributors",
     author_email="",

{tensorgrid_platform-1.19.2 → tensorgrid_platform-1.19.4}/tensorgrid/core/service.py

@@ -10,6 +10,7 @@ import logging
 import os
 import subprocess
 import sys
+import time
 
 import psutil
 import requests
@@ -317,6 +318,26 @@ class ServerService(Service):
         except:
             server_version = None
 
+        if server_version is not None and server_version != foc.VERSION:
+            is_local = address in ("127.0.0.1", "localhost", "::1", "0.0.0.0")
+            if is_local:
+                logger.warning(
+                    "Stale TensorGrid server v%s on port %i (client is v%s); "
+                    "restarting",
+                    server_version,
+                    port,
+                    foc.VERSION,
+                )
+                fosu.stop_server_on_port(port, address)
+                time.sleep(1)
+                server_version = None
+            else:
+                logger.warning(
+                    "Remote TensorGrid server v%s does not match client v%s",
+                    server_version,
+                    foc.VERSION,
+                )
+
         if server_version is None:
             # There is likely not a fiftyone server running (remote or local),
             # so start a local server. If there actually is a fiftyone server
@@ -332,12 +353,6 @@ class ServerService(Service):
                 port,
                 address,
             )
-            if server_version != foc.VERSION:
-                logger.warning(
-                    "Server version (%s) does not match client version (%s)",
-                    server_version,
-                    foc.VERSION,
-                )
 
     @property
     def command(self):

{tensorgrid_platform-1.19.2 → tensorgrid_platform-1.19.4}/tensorgrid/service/util.py

@@ -102,6 +102,92 @@ def find_processes_by_args(args):
             pass
 
 
+def _address_matches_listener(listener_ip, address):
+    """Returns whether *listener_ip* accepts connections for *address*."""
+    if address is None:
+        return True
+    if listener_ip in ("0.0.0.0", "::", ""):
+        return True
+    if address in ("127.0.0.1", "localhost") and listener_ip in (
+        "127.0.0.1",
+        "::1",
+    ):
+        return True
+    return listener_ip == address
+
+
+def find_processes_listening_on_port(port, address=None):
+    """Finds processes owned by the current user listening on a TCP port.
+
+    Args:
+        port (int): the port number
+        address (None): if specified, only listeners that accept connections on
+            this address are returned
+
+    Returns:
+        generator of psutil.Process objects
+    """
+    current_username = psutil.Process().username()
+    for process in psutil.process_iter(["username"]):
+        try:
+            if process.info["username"] != current_username:
+                continue
+            for conn in process.connections(kind="tcp"):
+                if (
+                    conn.status == psutil.CONN_LISTEN
+                    and conn.laddr.port == port
+                    and _address_matches_listener(conn.laddr.ip, address)
+                ):
+                    yield process
+                    break
+        except (psutil.NoSuchProcess, psutil.AccessDenied):
+            pass
+
+
+def kill_process_tree(process, timeout=5):
+    """Terminates a process and its descendants."""
+    process = normalize_wrapper_process(process)
+    try:
+        children = process.children(recursive=True)
+    except psutil.Error:
+        children = []
+
+    for child in reversed(children):
+        try:
+            child.terminate()
+        except psutil.NoSuchProcess:
+            pass
+
+    try:
+        process.terminate()
+    except psutil.NoSuchProcess:
+        return
+
+    _, alive = psutil.wait_procs([process] + children, timeout=timeout)
+    for proc in alive:
+        try:
+            proc.kill()
+        except psutil.NoSuchProcess:
+            pass
+
+
+def stop_server_on_port(port, address="127.0.0.1"):
+    """Stops TensorGrid server processes bound to the given port.
+
+    Args:
+        port (int): the port number
+        address (str): the server address
+    """
+    killed = set()
+    for process in find_processes_by_args(["main.py", "--port", str(port)]):
+        kill_process_tree(process)
+        killed.add(process.pid)
+
+    for process in find_processes_listening_on_port(port, address):
+        if process.pid not in killed:
+            kill_process_tree(process)
+
+
 def get_listening_tcp_ports(process):
     """Retrieves a list of TCP ports that the specified process is listening on.
 

{tensorgrid_platform-1.19.2 → tensorgrid_platform-1.19.4}/tensorgrid_platform.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: tensorgrid-platform
-Version: 1.19.2
-Summary: TensorGrid: multimodal data platform for building high-quality datasets and computer vision models (derived from FiftyOne)
+Version: 1.19.4
+Summary: TensorGrid: multimodal data platform for building high-quality datasets and computer vision models
 Home-page: https://github.com/rksaklani/TensorGrid
 Author: TensorGrid Contributors
 Author-email: 
@@ -93,8 +93,6 @@ Dynamic: summary
 
 **Multimodal data platform for building high-quality datasets and computer vision models.**
 
-Derived from [FiftyOne](https://github.com/voxel51/fiftyone) (Apache 2.0). See [NOTICE](https://github.com/rksaklani/TensorGrid/blob/main/NOTICE) for attribution.
-
 [![PyPI version](https://badge.fury.io/py/tensorgrid-platform.svg)](https://pypi.org/project/tensorgrid-platform/)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/rksaklani/TensorGrid/blob/main/core/LICENSE)
 [![Python](https://img.shields.io/pypi/pyversions/tensorgrid-platform)](https://pypi.org/project/tensorgrid-platform/)
@@ -109,7 +107,7 @@ Derived from [FiftyOne](https://github.com/voxel51/fiftyone) (Apache 2.0). See [
 pip install tensorgrid-platform
 ```
 
-`fiftyone-db` and `fiftyone-brain` are installed automatically as dependencies.
+Requires Python 3.10+.
 
 ## Quick start
 
@@ -131,13 +129,6 @@ tg app launch quickstart
 tensorgrid app launch quickstart
 ```
 
-## Python API
-
-```python
-import tensorgrid as tg          # recommended
-import fiftyone as fo            # compatibility alias
-```
-
 ## Development install
 
 Clone the [GitHub repository](https://github.com/rksaklani/TensorGrid), build the web app, then:
@@ -149,4 +140,4 @@ pip install -e core/
 
 ## License
 
-Apache 2.0. TensorGrid modifications © TensorGrid Contributors. Original FiftyOne © Voxel51, Inc.
+Apache 2.0. See [NOTICE](https://github.com/rksaklani/TensorGrid/blob/main/NOTICE) for attribution.