femtocrux 2.4.1__py3-none-any.whl → 2.5.0__py3-none-any.whl

femtocrux/VERSION

@@ -1 +1 @@
-2.4.1
+2.5.0

femtocrux/client/client.py

@@ -1,7 +1,6 @@
 from collections.abc import Iterable
 from dataclasses import dataclass
 import docker
-from getpass import getpass
 import google.protobuf
 import grpc
 import logging
@@ -11,12 +10,14 @@ import pickle
 import queue
 import sys
 import time
-from typing import Any, List, Tuple
+from typing import Any, List, Tuple, Iterator
 from contextlib import contextmanager
+import subprocess
 
 from fmot.fqir import GraphProto
 
 from femtocrux.util.utils import (
+    read_secret_raw,
     get_channel_options,
     serialize_sim_inputs_message,
     deserialize_simulation_output,
@@ -27,31 +28,38 @@ import femtocrux.grpc.compiler_service_pb2 as cs_pb2
 import femtocrux.grpc.compiler_service_pb2_grpc as cs_pb2_grpc
 
 # Docker info
-__docker_registry__ = "ghcr.io"
+__ghcr_docker_registry__ = "ghcr.io"
+__ecr_docker_registry__ = "201615177705.dkr.ecr.us-west-2.amazonaws.com"
 
+# Docker image names for GHCR and ECR
+__ghcr_image_name__ = None
+__ecr_image_name__ = None
 
-def _get_docker_image_name() -> str:
-    """
-    Returns the docker image name. For testing, override with the
-    FEMTOCRUX_SERVER_IMAGE_NAME environment variable.
-    """
+
+def _set_docker_image_names():
+    """Sets the docker image names based on the current version."""
+    from femtocrux.version import __version__
+
+    global __ghcr_image_name__, __ecr_image_name__
+    IMAGE = "femtocrux"
+    ORG = "femtosense"
+    __ghcr_image_name__ = f"{__ghcr_docker_registry__}/{ORG}/{IMAGE}:{__version__}"
+    __ecr_image_name__ = f"{__ecr_docker_registry__}/{IMAGE}:{__version__}"
+
+
+_set_docker_image_names()
+
+
+def _get_docker_image_names() -> List[str]:
+    """Returns a list of possible docker image names for this client version."""
     try:
-        return os.environ["FEMTOCRUX_SERVER_IMAGE_NAME"]
+        return [os.environ["FEMTOCRUX_SERVER_IMAGE_NAME"]]
     except KeyError:
-        from femtocrux.version import __version__
-
-        ORG = "femtosense"
-        IMAGE = "femtocrux"
-        remote_image_name = "%s/%s/%s:%s" % (
-            __docker_registry__,
-            ORG,
-            IMAGE,
-            __version__,
-        )
-        return remote_image_name
+        return [__ecr_image_name__, __ghcr_image_name__]
 
 
-__docker_image_name__ = _get_docker_image_name()
+__docker_image_names__ = _get_docker_image_names()
+__docker_image_name__ = None  # Will be set when image is found
 
 
 # Set up logging
@@ -63,6 +71,7 @@ def _init_logger():
     handler = logging.StreamHandler()
     handler.setFormatter(formatter)
     logger.addHandler(handler)
+    logger.propagate = False
     return logger
 
 
@@ -499,15 +508,18 @@ class CompilerClient(CompilerClientImpl):
 
     def _pull_docker_image(self):
         """Pull the Docker image from remote."""
+        global __docker_image_name__
 
         logger.info(
             """
             Attempting to pull docker image from remote.
 
-            Alternatively, you can pull the image yourself with the command:
-                docker pull %s
-            """,
-            __docker_image_name__,
+            If you were provided a femtoAI key beginning with "ghp" within the
+            past year, you can use it below.
+
+            Alternatively, you can generate a new key on the Developer Portal at:
+              https://developer.femto.ai/software-tools/sdk
+            """
         )
 
         # Log in to Github
@@ -520,24 +532,62 @@ class CompilerClient(CompilerClientImpl):
                 manual_pass = False
             else:
                 # Prompt the user for password entry
-                password = getpass("Please enter your Femtosense-provided key:")
+                password = read_secret_raw("Please enter your femtoAI-provided key:")
 
             # Log in to the client
             try:
-                resp = client.login(
-                    "femtodaemon", password, registry="https://" + __docker_registry__
-                )
+                resp_status = ""
+                if password.startswith("ghp"):
+                    logger.info("Logging in to GitHub Container Registry...")
+                    resp = client.login(
+                        "femtodaemon",
+                        password,
+                        registry="https://" + __ghcr_docker_registry__,
+                    )
+                    __docker_image_name__ = __ghcr_image_name__
+                    resp_status = resp.get("Status", "")
+                else:
+                    logger.info("Logging in to AWS ECR...")
+                    proc = subprocess.run(
+                        [
+                            "docker",
+                            "login",
+                            "--username",
+                            "AWS",
+                            "--password-stdin",
+                            __ecr_docker_registry__,
+                        ],
+                        input=password,
+                        check=True,
+                        capture_output=True,
+                        text=True,
+                    )
+                    __docker_image_name__ = __ecr_image_name__
+                    resp_status = (
+                        proc.stdout or proc.stderr or "Login Succeeded"
+                    ).strip()
             except docker.errors.APIError as exc:
                 if "denied" in exc.explanation:
                     logger.error("Docker authetication failed.")
                     # Retry password entry
                     if manual_pass:
                         continue
-
+                raise RuntimeError("Docker authentication failed") from exc
+            except subprocess.CalledProcessError as exc:
+                output = (exc.stderr or exc.stdout or "").lower()
+                if (
+                    "denied" in output
+                    or "unauthorized" in output
+                    or "bad request" in output
+                ):
+                    logger.error("Docker authentication failed.")
+                    # Retry password entry
+                    if manual_pass:
+                        continue
                 raise RuntimeError("Docker authentication failed") from exc
 
             # Login successful
-            logger.info(resp.get("Status", ""))
+            logger.info(resp_status)
             break
 
         def image_not_found_error() -> RuntimeError:
@@ -545,24 +595,71 @@ class CompilerClient(CompilerClientImpl):
             return RuntimeError(
                 """Docker image not found:
                 %s
-            Please notify your Femtosense representative."""
+            Please notify your femtoAI representative."""
                 % (__docker_image_name__)
             )
 
         # Download the image
         logger.info("Downloading image. This could take a few minutes...")
-        try:
-            client.images.pull(__docker_image_name__)
-        except docker.errors.ImageNotFound as exc:
-            raise image_not_found_error() from exc
-        except docker.errors.APIError as exc:
-            if exc.explanation == "manifest unknown":
+        if __docker_image_name__ == __ghcr_image_name__:
+            # For GHCR, use Docker SDK pull (we already authenticated via SDK)
+            try:
+                client.images.pull(__docker_image_name__)
+            except docker.errors.ImageNotFound as exc:
                 logger.error(
-                    "Docker image %s not found on the remote. Check if it is "
-                    "published.",
-                    __docker_image_name__,
+                    "Docker image %s not found on remote.", __docker_image_name__
+                )
+                raise image_not_found_error() from exc
+            except docker.errors.APIError as exc:
+                exp = (getattr(exc, "explanation", "") or str(exc)).lower()
+                if "manifest unknown" in exp or "not found" in exp:
+                    logger.error(
+                        "Docker image %s not found on remote.",
+                        __docker_image_name__,
+                    )
+                    raise image_not_found_error() from exc
+                if (
+                    "denied" in exp
+                    or "unauthorized" in exp
+                    or "no basic auth credentials" in exp
+                    or "forbidden" in exp
+                ):
+                    logger.error(
+                        "Pull access denied for %s. Details: %s",
+                        __docker_image_name__,
+                        exp,
+                    )
+                    raise RuntimeError("Docker authentication failed") from exc
+                raise RuntimeError(f"Docker pull failed: {exc}") from exc
+        else:
+            # For ECR, use Docker CLI to reuse CLI auth and avoid SDK auth issues
+            try:
+                subprocess.run(
+                    ["docker", "pull", __docker_image_name__],
+                    check=True,
                 )
-            raise image_not_found_error() from exc
+            except subprocess.CalledProcessError as exc:
+                output_text = (exc.stderr or exc.stdout or "").strip()
+                out_lower = output_text.lower()
+                if "manifest unknown" in out_lower or "not found" in out_lower:
+                    logger.error(
+                        "Docker image %s not found on remote.",
+                        __docker_image_name__,
+                    )
+                    raise image_not_found_error() from exc
+                if (
+                    "denied" in out_lower
+                    or "unauthorized" in out_lower
+                    or "no basic auth credentials" in out_lower
+                    or "forbidden" in out_lower
+                ):
+                    logger.error(
+                        "Pull access denied for %s. Details: %s",
+                        __docker_image_name__,
+                        output_text,
+                    )
+                    raise RuntimeError("Docker authentication failed") from exc
+                raise RuntimeError(f"Docker pull failed: {output_text}") from exc
 
         logger.info("Download completed.")
 
@@ -572,6 +669,7 @@ class CompilerClient(CompilerClientImpl):
         """
         Starts the server in a new Docker container.
         """
+        global __docker_image_name__
         if docker_kwargs is None:
             docker_kwargs = {}
 
@@ -582,11 +680,16 @@ class CompilerClient(CompilerClientImpl):
         existing_image_names = [
             tag for image in client.images.list() for tag in image.tags
         ]
-        if __docker_image_name__ not in existing_image_names:
+        for image_name in __docker_image_names__:
+            if image_name in existing_image_names:
+                __docker_image_name__ = image_name
+                break
+        if __docker_image_name__ is None:
             # Check if we are allowed to pull the image.
             # This is disabled for CI builds.
             image_not_found_msg = (
-                "Failed to find the docker image %s locally." % __docker_image_name__
+                "Failed to find the docker images %s locally."
+                % " or ".join(__docker_image_names__)
             )
             if not _env_var_to_bool("FS_ALLOW_DOCKER_PULL", default=True):
                 raise RuntimeError(
@@ -676,7 +779,9 @@ class CompilerClient(CompilerClientImpl):
 
 
 @contextmanager
-def ManagedCompilerClient(docker_kwargs: dict[str, Any] = None) -> CompilerClient:
+def ManagedCompilerClient(
+    docker_kwargs: dict[str, Any] = None
+) -> Iterator[CompilerClient]:
     client = CompilerClient(docker_kwargs=docker_kwargs)
     try:
         yield client

femtocrux/util/utils.py

@@ -3,6 +3,8 @@ import json
 import numpy as np
 import torch
 from typing import Any
+import sys
+import termios
 
 import femtocrux.grpc.compiler_service_pb2 as cs_pb2
 
@@ -89,3 +91,26 @@ def deserialize_simulation_data(proto: cs_pb2.simulation_data) -> dict:
 def deserialize_simulation_output(proto: cs_pb2.simulation_output) -> dict:
     """Deserializes a LargerMessage back into a dictionary of NumPy arrays."""
     return {key: deserialize_numpy_array(value) for key, value in proto.items()}
+
+
+def read_secret_raw(prompt="Secret: "):
+    """Read a secret from stdin without echoing or overflowing buffer"""
+    fd = sys.stdin.fileno()
+    sys.stdout.write(prompt)
+    sys.stdout.flush()
+    old = termios.tcgetattr(fd)
+    try:
+        new = termios.tcgetattr(fd)
+        new[3] &= ~(termios.ECHO | termios.ICANON)  # no echo, raw-ish
+        termios.tcsetattr(fd, termios.TCSADRAIN, new)
+        chunks = []
+        while True:
+            ch = sys.stdin.buffer.read(1)
+            if ch in (b"\n", b"\r"):
+                break
+            chunks.append(ch)
+        sys.stdout.write("\n")
+        sys.stdout.flush()
+        return b"".join(chunks).decode("utf-8", "replace")
+    finally:
+        termios.tcsetattr(fd, termios.TCSADRAIN, old)

{femtocrux-2.4.1.dist-info → femtocrux-2.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: femtocrux
-Version: 2.4.1
+Version: 2.5.0
 Summary: Femtosense Compiler
 Home-page: https://github.com/femtosense/femtocrux
 Author: Femtosense

{femtocrux-2.4.1.dist-info → femtocrux-2.5.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 femtocrux/ENV_REQUIREMENTS.sh,sha256=t_O1B4hJAMgxvH9gwp1qls6eVFmhSYBJe64KmuK_H-4,1389
 femtocrux/PY_REQUIREMENTS,sha256=UwXV0o3gieruZUYdN9r2bqQ0Wcf_vosjeP6LJVx6oF0,275
-femtocrux/VERSION,sha256=bYUOOsQtDdBr_czpFRwea0D0z1Jyd49j7s7Oonx48LY,6
+femtocrux/VERSION,sha256=cy9k2HT5B4jAGZsMGb_Zs7ZDbhQBFOU-RigyUy10xhw,6
 femtocrux/__init__.py,sha256=yIWd9I2PEXCn_PKIILAN3mkWeTf0tgtVualeTIHNxfQ,342
 femtocrux/version.py,sha256=uNg2kHxQo6oUN1ah7s9_85rCZVRoTHGPD1GAQPZW4lw,164
 femtocrux/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-femtocrux/client/client.py,sha256=jIkfdIwfTxveC4G-WtQVzumK0m_icdznHFE175P48y0,21601
+femtocrux/client/client.py,sha256=op9BX2PKajbqLOKF-uGwqevvn3eWyP4SaPAXVouQUtA,26410
 femtocrux/grpc/__init__.py,sha256=uiMHQt5I2eAKJqI3Zh0h1Gm7cmPR4PbaGS71nCJQCGw,169
 femtocrux/grpc/compiler_service_pb2.py,sha256=grQNjlnoUg8KKcykK7JcT7Pmv_7R7sjLpsoG_EHGyoY,5494
 femtocrux/grpc/compiler_service_pb2_grpc.py,sha256=Hl1bGJEYA7CvdIj38FUvlEolPGCoWyK8WazqOhx4v8s,8500
@@ -14,9 +14,9 @@ femtocrux/server/exceptions.py,sha256=lI6n471n5QKf5G3aL_1kuBVEItD-jBgithVVpPDwNY
 femtocrux/server/healthcheck.py,sha256=ehqAwnv0D0zpy-AUZAPwv8rp874DZCwUmP8nzdXzZvI,1565
 femtocrux/server/server.py,sha256=sumnTj63uOGkzwj4-xwTuN4wVB7CDopy8e7PLOpW64Q,7405
 femtocrux/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-femtocrux/util/utils.py,sha256=HlmlqS-R7d7PaYaYi8sY6U0p9NoeHjQ1ObapBMKhCrU,3356
-femtocrux-2.4.1.dist-info/licenses/LICENSE,sha256=eN9ZI1xHjUmFvN3TEeop5kBGXRUBfbsl55KBNBYYFqI,36
-femtocrux-2.4.1.dist-info/METADATA,sha256=Ai9FkAA9F-z1pH90dxJm_6EaPsmYfiUQIIjBUFejlWw,2763
-femtocrux-2.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-femtocrux-2.4.1.dist-info/top_level.txt,sha256=BkTttlioC3je__8577wxRieZqY3Abu7FOOdMnmYbcNI,10
-femtocrux-2.4.1.dist-info/RECORD,,
+femtocrux/util/utils.py,sha256=v8v09aDaOtfejpSIB-LgaA--JJj9o2_BWvNwjd8wfww,4134
+femtocrux-2.5.0.dist-info/licenses/LICENSE,sha256=eN9ZI1xHjUmFvN3TEeop5kBGXRUBfbsl55KBNBYYFqI,36
+femtocrux-2.5.0.dist-info/METADATA,sha256=kg2G-ADUnaqAcUOqT7K6rAt67Qv03pBwIuda-yqSbkU,2763
+femtocrux-2.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+femtocrux-2.5.0.dist-info/top_level.txt,sha256=BkTttlioC3je__8577wxRieZqY3Abu7FOOdMnmYbcNI,10
+femtocrux-2.5.0.dist-info/RECORD,,