arkitekt-next 0.7.60__tar.gz → 0.8.1__tar.gz

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.7.60
+Version: 0.8.1
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -16,24 +16,24 @@ Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: all
 Provides-Extra: blok
 Provides-Extra: cli
-Requires-Dist: blok (>=0.0.19) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "blok")
+Requires-Dist: blok (>=0.0.19) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "blok")
 Requires-Dist: cryptography (>=40.0.8) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "blok")
-Requires-Dist: dokker (>=0.1.21)
-Requires-Dist: fakts (>=0.5.0)
-Requires-Dist: fluss-next (>=0.1.79) ; extra == "all"
-Requires-Dist: herre (>=0.4.3)
-Requires-Dist: kabinet (>=0.1.17) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
-Requires-Dist: koil (>=0.3.6)
-Requires-Dist: lovekit (>=0.1.6) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
-Requires-Dist: mikro-next (>=0.1.34) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
+Requires-Dist: dokker (>=1.0.0)
+Requires-Dist: fakts (>=1.0.0)
+Requires-Dist: fluss-next (>=0.1.83) ; extra == "all"
+Requires-Dist: herre (>=1.0.0)
+Requires-Dist: kabinet (>=0.1.22) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
+Requires-Dist: koil (>=1.0.0)
+Requires-Dist: lovekit (>=0.1.10) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
+Requires-Dist: mikro-next (>=0.1.38) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
 Requires-Dist: namegenerator (>=1.0.6) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "blok")
 Requires-Dist: netifaces (>=0.11.0) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "blok")
-Requires-Dist: reaktion-next (>=0.1.69) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
-Requires-Dist: rekuest-next (>=0.2.25) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: reaktion-next (>=0.1.73) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
+Requires-Dist: rekuest-next (>=0.2.29) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
 Requires-Dist: rich-click (>=1.6.1) ; extra == "cli" or extra == "all"
 Requires-Dist: semver (>=3.0.1) ; extra == "cli" or extra == "all"
-Requires-Dist: turms (>=0.5.0) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "cli" or extra == "all")
-Requires-Dist: unlok-next (>=0.1.73) ; python_version >= "3.8" and python_version < "4.0"
+Requires-Dist: turms (>=0.6.0) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: unlok-next (>=0.1.77) ; python_version >= "3.8" and python_version < "4.0"
 Requires-Dist: watchfiles (>=0.18.1) ; extra == "cli" or extra == "all"
 Description-Content-Type: text/markdown
 
@@ -64,7 +64,7 @@ To understand the idea behind arkitekt_next, you need to understand the idea beh
 ## Install
 
 ```bash
-pip install arkitekt_next[all]
+pip install arkitekt-next[all]
 ```
 
 This installs all dependencies for the arkitekt_next platform, inlcuding the arkitekt_next CLI, which can be used to develop and create apps, containerize them and deploy t
@@ -81,7 +81,7 @@ type annotations, orchestration of real-time (in memoery) workflows, data hostin
 To get started create a directory and run
 
 ```bash
-arkitekt_next init
+arkitekt-next init
 ```
 
 Which will lead you throught an app creation process.
@@ -105,7 +105,7 @@ And then connected to a local or remote server by running
 Run example:
 
 ```bash
-arkitekt_next run dev
+arkitekt-next run dev
 ```
 
 

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/README.md

@@ -25,7 +25,7 @@ To understand the idea behind arkitekt_next, you need to understand the idea beh
 ## Install
 
 ```bash
-pip install arkitekt_next[all]
+pip install arkitekt-next[all]
 ```
 
 This installs all dependencies for the arkitekt_next platform, inlcuding the arkitekt_next CLI, which can be used to develop and create apps, containerize them and deploy t
@@ -42,7 +42,7 @@ type annotations, orchestration of real-time (in memoery) workflows, data hostin
 To get started create a directory and run
 
 ```bash
-arkitekt_next init
+arkitekt-next init
 ```
 
 Which will lead you throught an app creation process.
@@ -66,7 +66,7 @@ And then connected to a local or remote server by running
 Run example:
 
 ```bash
-arkitekt_next run dev
+arkitekt-next run dev
 ```
 
 

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/arkitekt_next/__init__.py

@@ -11,11 +11,21 @@ try:
     from rekuest_next.register import register
     from rekuest_next.agents.hooks import background
     from rekuest_next.agents.hooks import startup
+    from rekuest_next.agents.context import context
+    from rekuest_next.state.state import state
+    from rekuest_next.actors.reactive.api import progress, aprogress
+    from rekuest_next.actors.reactive.api import log, alog
 except ImportError as e:
     raise e
     register = missing_install("rekuest_next", e)
     background = missing_install("rekuest_next", e)
     startup = missing_install("rekuest_next", e)
+    context = missing_install("rekuest_next", e)
+    state = missing_install("rekuest_next", e)
+    progress = missing_install("rekuest_next", e)
+    aprogress = missing_install("rekuest_next", e)
+    log = missing_install("rekuest_next", e)
+    alog = missing_install("rekuest_next", e)
 
 from .builders import easy, interactive
 from .apps.types import App
@@ -38,6 +48,8 @@ __all__ = [
     "useInstanceID",
     "useUser",
     "next",
+    "state",
+    "context",
     "background",
     "startup",
     "register_next",

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/arkitekt_next/bloks/arkitekt.py

@@ -43,17 +43,7 @@ class ArkitektBlok:
         scale: Optional[TailscaleBlok] = None,
         orkestrator: Optional[OrkestratorBlok] = None,
     ):
-        print(
-            gateway,
-            mikro,
-            kabinet,
-            rekuest,
-            fluss,
-            gateway,
-            internal_engine,
-            scale,
-            orkestrator,
-        )
+        pass
 
     def build(self, cwd):
         pass

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/arkitekt_next/bloks/postgres.py

@@ -64,20 +64,20 @@ class PostgresBlok(BaseModel):
             "labels": ["fakts.service=live.arkitekt.postgres"],
         }
 
-
         if self.build_repo or self.dev:
-            mount = init.get_service(MountService).register_mount(self.host, Repo(self.repo))
+            mount = init.get_service(MountService).register_mount(
+                self.host, Repo(self.repo)
+            )
             self.build_image["build"] = mount
         else:
             self.build_image["image"] = self.image
 
-            
     def build(self, context: ExecutionContext):
 
         self.build_image["environment"]["POSTGRES_MULTIPLE_DATABASES"] = ",".join(
             self.registered_dbs.keys()
         )
-        
+
         context.docker_compose.set_nested(f"services", self.host, self.build_image)
 
     def get_options(self):
@@ -124,4 +124,13 @@ class PostgresBlok(BaseModel):
             default=self.dev,
         )
 
-        return [with_postgres_password, skip_build, with_user_password, with_image, with_repo, build_repo, mount_repo, dev]
+        return [
+            with_postgres_password,
+            skip_build,
+            with_user_password,
+            with_image,
+            with_repo,
+            build_repo,
+            mount_repo,
+            dev,
+        ]

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/arkitekt_next/builders.py

@@ -109,7 +109,6 @@ def easy(
         requirements=registry.get_requirements(),
     )
     if token:
-        print("Using token")
         fakts = build_arkitekt_next_token_fakts(
             manifest=manifest,
             token=token,
@@ -117,7 +116,6 @@ def easy(
         )
 
     elif redeem_token:
-        print("Using redeem token")
         fakts = build_arkitekt_next_redeem_fakts_next(
             manifest=manifest,
             redeem_token=redeem_token,
@@ -126,7 +124,6 @@ def easy(
             headless=headless,
         )
     else:
-        print("Using normal fakts")
         fakts = build_arkitekt_next_fakts_next(
             manifest=manifest,
             url=url,
@@ -160,8 +157,8 @@ def easy(
     return app
 
 
-
-def interactive(identifier: str,
+def interactive(
+    identifier: str,
     version: str = "0.0.1",
     logo: Optional[str] = None,
     scopes: Optional[List[str]] = None,
@@ -174,23 +171,26 @@ def interactive(identifier: str,
     app_kind: str = "development",
     registry: Optional[ServiceBuilderRegistry] = None,
     sync_mode: bool = True,
-    **kwargs):
+    **kwargs,
+):
     """Creates an interactive jupyter app"""
 
-    app =  easy(identifier=identifier,
-                version=version,
-                logo=logo,
-                scopes=scopes,
-                url=url,
-                headless=headless,
-                log_level=log_level,
-                token=token,
-                no_cache=no_cache,
-                redeem_token=redeem_token,
-                app_kind=app_kind,
-                registry=registry,
-                **kwargs)
-    
+    app = easy(
+        identifier=identifier,
+        version=version,
+        logo=logo,
+        scopes=scopes,
+        url=url,
+        headless=headless,
+        log_level=log_level,
+        token=token,
+        no_cache=no_cache,
+        redeem_token=redeem_token,
+        app_kind=app_kind,
+        registry=registry,
+        **kwargs,
+    )
+
     if sync_mode:
         # When running in an interactive async enironvment, just like
         # in a jupyter notebook, we can opt to run the app in sync mode

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/arkitekt_next/cli/commands/call/remote.py

@@ -3,7 +3,6 @@ from arkitekt_next.cli.options import *
 import asyncio
 from arkitekt_next.cli.ui import construct_run_panel
 from importlib import import_module
-from rekuest.postmans.utils import arkiuse
 import rich_click as click
 from arkitekt_next.cli.options import *
 import asyncio
@@ -19,12 +18,7 @@ async def call_app(
     arg,
 ):
     async with app:
-        async with arkiuse(
-            hash=hash,
-            postman=app.rekuest.postman,
-        ) as a:
-            print(arg)
-            print(await a.aassign(kwargs=arg))
+        raise NotImplementedError("This is not implemented yet")
 
 
 @click.command("prod")

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/arkitekt_next/cli/commands/kabinet/utils.py

@@ -1,3 +1,4 @@
+import logging
 from typing import Optional
 import os
 import yaml
@@ -42,6 +43,6 @@ def validate_flavours(flavours_folder: str, only: Optional[str]):
                 )
 
         else:
-            print(
+            logging.info(
                 f"Found file {dir_name} in flavours folder. Not a valid flavour. Ignoring"
             )

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/arkitekt_next/cli/dockerfiles/vanilla.dockerfile

@@ -1,6 +1,7 @@
 FROM python:3.11-slim-buster
+ARG ARKITEKT_VERSION=0.8.0
 
-RUN pip install "arkitekt-next[all]>=0.7.31"
+RUN pip install "arkitekt-next[all]>=${ARKITEKT_VERSION}"
 
 RUN mkdir /app
 WORKDIR /app

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/arkitekt_next/cli/io.py

@@ -9,7 +9,6 @@ from arkitekt_next.cli.types import (
     Deployment,
     Flavour,
     DeploymentsConfigFile,
-    DefinitionInput,
 )
 import yaml
 import json
@@ -202,7 +201,6 @@ def generate_deployment(
     deployment_run: str,
     build: Build,
     image: str,
-    definitions: Optional[List[DefinitionInput]] = None,
 ) -> Deployment:
     """Generates a deployment from a build and an image
 

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/arkitekt_next/cli/types.py

@@ -1,3 +1,4 @@
+from importlib.metadata import version
 from pydantic import BaseModel, Field, validator
 import datetime
 from typing import List, Optional, Union, Literal, Dict
@@ -5,7 +6,6 @@ from enum import Enum
 import semver
 import uuid
 from arkitekt_next.model import Requirement
-from rekuest.api.schema import DefinitionInput
 from string import Formatter
 import os
 
@@ -35,7 +35,7 @@ class Manifest(BaseModel):
     identifier: str
     version: str
     author: str
-    logo: Optional[str]
+    logo: Optional[str] = None
     entrypoint: str
     scopes: List[str]
     created_at: datetime.datetime = Field(default_factory=datetime.datetime.now)
@@ -229,6 +229,8 @@ class Flavour(BaseModel):
             "-f",
             "{dockerfile}",
             ".",
+            "--build-arg",
+            "ARKITEKT_VERSION={package_version}",
         ]
     )
 
@@ -246,9 +248,18 @@ class Flavour(BaseModel):
     def generate_build_command(self, tag: str, relative_dir: str):
         """Generates the build command for this flavour"""
 
+        try:
+            package_version = version('arkitekt_next')
+            print(f"Detected Arkitekt Package version: {package_version}")
+        except:
+            package_version = "0.8.0"
+            print("Could not detect Arkitekt Package version. Using 0.8.0")
+        
+
+
         dockerfile = os.path.join(relative_dir, self.dockerfile)
 
-        return [v.format(tag=tag, dockerfile=dockerfile) for v in self.build_command]
+        return [v.format(tag=tag, dockerfile=dockerfile, package_version=package_version) for v in self.build_command]
 
     def check_relative_paths(self, flavour_folder: str):
         """Checks that the paths are relative to the flavour folder"""

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/arkitekt_next/model.py

@@ -85,7 +85,7 @@ class Manifest(BaseModel):
 
     def hash(self):
         """Hash the manifest"""
-        return sha256(self.json(sort_keys=True).encode()).hexdigest()
+        return sha256(self.model_dump_json().encode()).hexdigest()
 
 
 class User(BaseModel):

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/arkitekt_next/qt/builders.py

@@ -130,7 +130,6 @@ def devqt(
         requirements=registry.get_requirements(),
     )
     if token:
-        print("Using token")
         fakts = build_arkitekt_next_token_fakts(
             manifest=manifest,
             token=token,
@@ -138,7 +137,6 @@ def devqt(
         )
 
     elif redeem_token:
-        print("Using redeem token")
         fakts = build_arkitekt_next_redeem_fakts_next(
             manifest=manifest,
             redeem_token=redeem_token,
@@ -147,7 +145,6 @@ def devqt(
             headless=headless,
         )
     else:
-        print("Using normal fakts")
         fakts = build_arkitekt_next_fakts_next(
             manifest=manifest,
             url=url,

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/arkitekt_next/qt/magic_bar.py

@@ -63,7 +63,7 @@ class Logo(QtWidgets.QWidget):
                     data = await resp.read()
                     return data
                 else:
-                    print(f"Failed to download the image. Status code: {resp.status}")
+                    logger.error(f"Failed to download the image. Status code: {resp.status}")
                     return None
 
 

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/arkitekt_next/service_registry.py

@@ -76,9 +76,9 @@ def check_and_import_services() -> ServiceBuilderRegistry:
                 rekuest_module.init_services(service_builder_registry)
                 logging.info(f"Called init_service function from {module_name}")
             else:
-                print(f"No init_services function in {module_name}.__arkitekt__")
+                logging.debug(f"No init_services function in {module_name}.__arkitekt__. Skipping.")
         except Exception as e:
-            print(f"Failed to call init_services for {module_name}: {e}")
+            logging.critical(f"Failed to call init_services for {module_name}: {e}")
             traceback.print_exc()
 
     # Check local modules in the current working directory

{arkitekt_next-0.7.60 → arkitekt_next-0.8.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.7.60"
+version = "0.8.1"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"
@@ -9,23 +9,23 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.8"
-herre = ">=0.4.3"
-fakts = ">=0.5.0"
-mikro-next = { version = ">=0.1.34", python = "^3.10", optional = true }
-kabinet = { version = ">=0.1.17", optional = true,  python = "^3.9" }
-fluss-next = { version = ">=0.1.79", optional = true }
-reaktion-next= { version = ">=0.1.69", python = "^3.8", optional = true }
-rekuest-next= { version = ">=0.2.25", python = "^3.8", optional = true }
-unlok-next= { version = ">=0.1.73", python = "^3.8", optional = true }
-lovekit = { version = ">=0.1.6", python = "^3.9", optional = true }
+herre = ">=1.0.0"
+fakts = ">=1.0.0"
+mikro-next = { version = ">=0.1.38", python = "^3.10", optional = true }
+kabinet = { version = ">=0.1.22", optional = true,  python = "^3.9" }
+fluss-next = { version = ">=0.1.83", optional = true }
+reaktion-next= { version = ">=0.1.73", python = "^3.8", optional = true }
+rekuest-next= { version = ">=0.2.29", python = "^3.8", optional = true }
+unlok-next= { version = ">=0.1.77", python = "^3.8", optional = true }
+lovekit = { version = ">=0.1.10", python = "^3.10", optional = true }
 rich-click = { version = ">=1.6.1", optional = true }
 watchfiles = { version = ">=0.18.1", optional = true }
-turms = { version = ">=0.5.0", python = "^3.9", optional = true }
+turms = { version = ">=0.6.0", python = "^3.9", optional = true }
 semver = { version = ">=3.0.1", optional = true }
-dokker = ">=0.1.21"
-koil = ">=0.3.6"
+dokker = ">=1.0.0"
+koil = ">=1.0.0"
 netifaces = { version = ">=0.11.0", python = "^3.8", optional = true }
-blok = { version = ">=0.0.19", python = "^3.8", optional = true }
+blok = { version = ">=0.0.19", python = "^3.9", optional = true }
 cryptography = { version = ">=40.0.8", python = "^3.8", optional = true }
 namegenerator = { version = ">=1.0.6", python = "^3.8", optional = true }
 
@@ -83,17 +83,11 @@ exclude = [
 line-length = 100
 
 [tool.poetry.group.dev.dependencies]
-testcontainers = "3.7.0"
 autoflake = "^1.7.7"
 pytest = "^7.2.0"
 pytest-asyncio = "^0.20.2"
-aiohttp = "^3.8.3"
-websockets = "^10.4"
-black = "^23.1.0"
 pytest-cov = "^4.0.0"
 pytest-aiohttp = "^1.0.4"
-ruff = "^0.0.254"
-mypy = "^1.0.1"
 types-pyyaml = "^6.0.12.12"
 pyqt5-stubs = "^5.15.6.0"