nebu 0.1.9__py3-none-any.whl → 0.1.11__py3-none-any.whl

nebu/processors/decorate.py

@@ -170,6 +170,33 @@ def processor(
             function_source = inspect.getsource(func)
             # Clean up the indentation
             function_source = textwrap.dedent(function_source)
+
+            # Remove the @processor decorator (single or multi-line) if present
+            lines = function_source.split("\\n")
+            filtered_lines = []
+            skipping_decorator = False
+            decorator_name = "processor"  # Assuming the decorator is always @processor
+            for line in lines:
+                stripped_line = line.strip()
+                if stripped_line.startswith(f"@{decorator_name}"):
+                    skipping_decorator = True
+                    continue  # Skip the decorator starting line itself
+                if skipping_decorator:
+                    if stripped_line.startswith("def "):
+                        skipping_decorator = False
+                        # Add the 'def' line, as it's the start of the function
+                        filtered_lines.append(line)
+                    else:
+                        # Still inside the decorator block, skip this line
+                        continue
+                else:
+                    # Not skipping, and not the start of the decorator, so keep the line
+                    filtered_lines.append(line)
+
+            processed_function_source = "\\n".join(filtered_lines)
+            # Update function_source with the processed version
+            function_source = processed_function_source
+
         except (IOError, TypeError):
             raise ValueError(
                 f"Could not retrieve source code for function {func.__name__}"

nebu/processors/models.py

@@ -1,6 +1,6 @@
 from typing import Any, Generic, List, Optional, TypeVar
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
 
 # Assuming these are imported from other modules
 from nebu.containers.models import V1ContainerRequest
@@ -36,12 +36,8 @@ class V1Scale(BaseModel):
     zero: Optional[V1ScaleZero] = None
 
 
-def default_processor_kind() -> str:
-    return "Processor"
-
-
 class V1Processor(BaseModel):
-    kind: str = Field(default_factory=default_processor_kind)
+    kind: str = "Processor"
     metadata: V1ResourceMeta
     container: Optional[V1ContainerRequest] = None
     stream: str
@@ -61,7 +57,7 @@ class V1Processor(BaseModel):
 
 
 class V1ProcessorRequest(BaseModel):
-    kind: str = Field(default_factory=default_processor_kind)
+    kind: str = "Processor"
     metadata: V1ResourceMetaRequest
     container: Optional[V1ContainerRequest] = None
     schema_: Optional[Any] = None
@@ -93,29 +89,13 @@ class V1UpdateProcessor(BaseModel):
     no_delete: Optional[bool] = None
 
 
-def kind_v1_stream_message() -> str:
-    return "StreamMessage"
-
-
-def kind_v1_stream_response_message() -> str:
-    return "StreamResponseMessage"
-
-
-def kind_v1_openai_stream_message() -> str:
-    return "OpenAIStreamMessage"
-
-
-def kind_v1_openai_stream_response() -> str:
-    return "OpenAIStreamResponse"
-
-
 class V1StreamData(BaseModel):
     content: Any = None
     wait: Optional[bool] = None
 
 
-class V1StreamMessage(Generic[T], BaseModel):
-    kind: str = Field(default_factory=kind_v1_stream_message)
+class V1StreamMessage(BaseModel, Generic[T]):
+    kind: str = "StreamMessage"
     id: str
     content: Optional[T] = None
     created_at: int
@@ -127,7 +107,7 @@ class V1StreamMessage(Generic[T], BaseModel):
 
 
 class V1StreamResponseMessage(BaseModel):
-    kind: str = Field(default_factory=kind_v1_stream_response_message)
+    kind: str = "StreamResponseMessage"
     id: str
     content: Any = None
     status: Optional[str] = None
@@ -136,7 +116,7 @@ class V1StreamResponseMessage(BaseModel):
 
 
 class V1OpenAIStreamMessage(BaseModel):
-    kind: str = Field(default_factory=kind_v1_openai_stream_message)
+    kind: str = "OpenAIStreamMessage"
     id: str
     content: Any  # Using Any for ChatCompletionRequest
     created_at: int
@@ -148,7 +128,7 @@ class V1OpenAIStreamMessage(BaseModel):
 
 
 class V1OpenAIStreamResponse(BaseModel):
-    kind: str = Field(default_factory=kind_v1_openai_stream_response)
+    kind: str = "OpenAIStreamResponse"
     id: str
     content: Any  # Using Any for ChatCompletionResponse
     created_at: int

{nebu-0.1.9.dist-info → nebu-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nebu
-Version: 0.1.9
+Version: 0.1.11
 Summary: A globally distributed container runtime
 Requires-Python: >=3.10.14
 Description-Content-Type: text/markdown

{nebu-0.1.9.dist-info → nebu-0.1.11.dist-info}/RECORD

@@ -7,14 +7,14 @@ nebu/containers/decorator.py,sha256=qiM7hbHne9MhSp1gDgX5z5bimsXr_YPjTIZoe09dwr4,
 nebu/containers/models.py,sha256=0j6NGy4yto-enRDh_4JH_ZTbHrLdSpuMOqNQPnIrwC4,6815
 nebu/containers/server.py,sha256=yFa2Y9PzBn59E1HftKiv0iapPonli2rbGAiU6r-wwe0,2513
 nebu/processors/consumer.py,sha256=rFqd6gg2OYgXi3gf11GFpuaOOzuK1TYaPO-t_leSR8Y,15097
-nebu/processors/decorate.py,sha256=8jemT7QvY-2aAJAOiYzjClja-Zso0QgWXZH377uIW4I,13126
+nebu/processors/decorate.py,sha256=ERCYk3D6L8GAg05NSZJG73kJx-hzNCskZFaN7-oBMZY,14437
 nebu/processors/default.py,sha256=W4slJenG59rvyTlJ7gRp58eFfXcNOTT2Hfi6zzJAobI,365
-nebu/processors/models.py,sha256=ZCHSXYZzdiMvhvCdi1y3lvD63oUOv8xIp5ncPaepibw,4223
+nebu/processors/models.py,sha256=GvnI8UJrQSjHo2snP07cPfisCH90cEGTY-PZV5_AtXI,3654
 nebu/processors/processor.py,sha256=oy2YdI-cy6qQWxrZhpZahJV46oWZlu_Im-jm811R_oo,9667
 nebu/redis/models.py,sha256=coPovAcVXnOU1Xh_fpJL4PO3QctgK9nBe5QYoqEcnxg,1230
 nebu/services/service.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nebu-0.1.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-nebu-0.1.9.dist-info/METADATA,sha256=h6OCHxCdApdiQongRaRCFRxxFbLXfSraoDyLt_MGu_s,1587
-nebu-0.1.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nebu-0.1.9.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
-nebu-0.1.9.dist-info/RECORD,,
+nebu-0.1.11.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nebu-0.1.11.dist-info/METADATA,sha256=yCMJNMUGXp93yIOHWJ860NsdopJMqR2VsT-X3bM18EU,1588
+nebu-0.1.11.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nebu-0.1.11.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
+nebu-0.1.11.dist-info/RECORD,,