simile 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

simile/resource_agent.py

@@ -1,6 +1,7 @@
 # simile/resource_agent.py
 """
-Implements Agent-related methods analogous to how you might use openai.Completion or similar classes.
+Implements Agent-related methods.
+We now hide async calls by automatically waiting on tasks.
 """
 
 from .api_requestor import request
@@ -15,22 +16,41 @@ class Agent:
         forked_agent_id="",
         speech_pattern="",
         self_description="",
-        population_id="",
+        population_id=None,
         read_permission="private",
         write_permission="private",
         agent_data=None
     ):
         """
-        Asynchronously create an agent via POST /create_single_agent/
-        Returns a Task object that you can poll or wait on.
-
-        Usage:
-            from simile import Agent
-            task = Agent.create("John", "Doe")
-            # block until done:
-            result = task.wait()  # => {"agent_id": "..."}
-            new_agent_id = result["agent_id"]
+        Creates a new agent (blocking call).
+        
+        * first_name (required)
+        * last_name  (required)
+        * population_id (required)
+        * read_permission (default: 'private')
+        * write_permission (default: 'private')
+        
+        This function will not return until the creation is fully done server-side.
+        
+        Returns:
+            agent_id (str): The new agent's unique ID.
+        
+        Raises:
+            ValueError if required fields are missing.
+            RequestError if the server returns an error.
         """
+        # Validate required fields
+        if not first_name:
+            raise ValueError("first_name is required.")
+        if not last_name:
+            raise ValueError("last_name is required.")
+        if not population_id:
+            raise ValueError("population_id is required.")
+        if not read_permission:
+            raise ValueError("read_permission is required.")
+        if not write_permission:
+            raise ValueError("write_permission is required.")
+
         if agent_data is None:
             agent_data = []
 
@@ -46,6 +66,7 @@ class Agent:
             "agent_data": agent_data
         }
 
+        # Kick off the creation, which returns a task
         resp = request("POST", "/create_single_agent/", json=payload)
         data = resp.json()
         task_id = data.get("task_id")
@@ -54,7 +75,15 @@ class Agent:
 
         # The result endpoint is /create_single_agent_result/<task_id>/
         result_endpoint = "/create_single_agent_result/{task_id}/"
-        return Task(task_id, result_endpoint)
+
+        # Wait for the task to finish
+        final_data = Task(task_id, result_endpoint).wait()
+        agent_id = final_data.get("agent_id")
+
+        if not agent_id:
+            raise RequestError("No 'agent_id' returned in final result.")
+
+        return agent_id
 
     @staticmethod
     def retrieve_details(agent_id):
@@ -79,15 +108,13 @@ class Agent:
     @staticmethod
     def generate_response(agent_id, question_type, question_payload):
         """
-        Asynchronously generate an agent's response via /generate_agent_response/.
+        Generates an agent's response (blocking call).
+        
         question_type can be 'categorical', 'numerical', or 'chat'.
-        question_payload is a dict. E.g. { "question": "...", "options": [...] }, etc.
+        question_payload is a dict, e.g. { "question": "...", "options": [...] }
         
-        Returns a Task object for polling or waiting.
-        Usage:
-            from simile import Agent
-            task = Agent.generate_response("a_123", "chat", {...})
-            result = task.wait()
+        Returns:
+            The final result from the server once the async task completes.
         """
         payload = {
             "agent_id": agent_id,
@@ -102,4 +129,7 @@ class Agent:
 
         # The result endpoint is /generate_agent_response_result/<task_id>/
         result_endpoint = "/generate_agent_response_result/{task_id}/"
-        return Task(task_id, result_endpoint)
+
+        # Wait and return final data
+        final_data = Task(task_id, result_endpoint).wait()
+        return final_data

simile/resource_population.py

@@ -1,6 +1,7 @@
 # simile/resource_population.py
 """
-Implements Population-related methods: create, get_agents, add_agent, remove_agent, delete, etc.
+Implements Population-related methods.
+Some are synchronous; get_sub_population is async but we now hide the wait.
 """
 
 from .api_requestor import request
@@ -9,12 +10,37 @@ from .error import RequestError
 
 class Population:
     @staticmethod
-    def create(name="New Population"):
+    def create(name, read_permission="private", write_permission="private", readme=""):
         """
         Synchronously create a population via POST /create_population/.
-        Returns a dict { "status": "success", "population_id": "..." } or raises an error.
+        
+        Required fields:
+          - name
+          - read_permission
+          - write_permission
+        Optional:
+          - readme
+
+        Returns:
+            {
+              "status": "success",
+              "population_id": "..."
+            }
+        or raises an error.
         """
-        payload = {"name": name}
+        if not name:
+            raise ValueError("name is required.")
+        if not read_permission:
+            raise ValueError("read_permission is required.")
+        if not write_permission:
+            raise ValueError("write_permission is required.")
+
+        payload = {
+            "name": name,
+            "read_permission": read_permission,
+            "write_permission": write_permission,
+            "readme": readme
+        }
         resp = request("POST", "/create_population/", json=payload)
         return resp.json()
 
@@ -65,23 +91,29 @@ class Population:
         return resp.json()
 
     @staticmethod
-    def create_sub_population(population_id="", n=1):
+    def get_sub_population(population_id="", n=1):
         """
-        Asynchronously create a sub-population by sampling from an existing population
-        or from all agents if no population_id is given.
-        Endpoint: POST /create_sub_population/
-        Returns a Task object. On success, final data should have "new_population_id".
+        Initiates a sub-population retrieval/generation (blocking call) by sampling
+        from an existing population (if population_id is provided) or from all
+        agents if no population_id is given.
+
+        Endpoint: POST /get_sub_population/
+        Waits until the async task completes, then returns final result, typically
+        containing "new_population_id".
         """
         payload = {
             "population_id": population_id,
             "n": n
         }
-        resp = request("POST", "/create_sub_population/", json=payload)
+        resp = request("POST", "/get_sub_population/", json=payload)
         data = resp.json()
         task_id = data.get("task_id")
         if not task_id:
-            raise RequestError("No 'task_id' returned from create_sub_population endpoint.")
+            raise RequestError("No 'task_id' returned from get_sub_population endpoint.")
+
+        # The result endpoint is /get_sub_population_result/<task_id>/
+        result_endpoint = "/get_sub_population_result/{task_id}/"
 
-        # The result endpoint is /create_sub_population_result/<task_id>/
-        result_endpoint = "/create_sub_population_result/{task_id}/"
-        return Task(task_id, result_endpoint)
+        # Wait for completion and return the final result
+        final_data = Task(task_id, result_endpoint).wait()
+        return final_data

simile/task.py

@@ -6,6 +6,7 @@ class Task:
     """
     Represents an asynchronous Celery-like task. 
     Contains logic for polling the result endpoint until completion or failure.
+    Used internally to hide the async nature from the end user.
     """
     def __init__(self, task_id, result_endpoint):
         self.task_id = task_id
@@ -55,8 +56,7 @@ class Task:
             self._finished = True
             self._last_result = data.get("error")
         else:
-            # Some other custom statuses
-            # We'll treat them like "still running"
+            # Some other custom statuses are treated as "still running"
             pass
 
     def wait(self, interval=2, timeout=300):
@@ -70,7 +70,9 @@ class Task:
             if self._finished:
                 break
             if time.time() - start > timeout:
-                raise TimeoutError(f"Task {self.task_id} did not complete within {timeout} seconds.")
+                raise TimeoutError(
+                    f"Task {self.task_id} did not complete within {timeout} seconds."
+                )
             time.sleep(interval)
 
         if self._last_status == "SUCCESS":

{simile-0.1.0.dist-info → simile-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: simile
-Version: 0.1.0
+Version: 0.1.1
 Summary: A Python client library for interacting with my Agent & Population endpoints
 Home-page: https://github.com/simile-team/simile
 Author: Joon Sung Park

simile-0.1.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+simile/__init__.py,sha256=ru0KrsAf-hMJLigoRePoGt8rIA_q8GAaq5FgO42RD-U,1193
+simile/api_requestor.py,sha256=03SWFV5Nrc9w-4ZCJ29hWTJSN8paR26isTLLrwL0h_0,1546
+simile/config.py,sha256=q9twMCyF7jmzxWI0u1KDEXY-MBhHzcy3EiggwzAl-wU,624
+simile/error.py,sha256=Kw6qAtqp1xugiRmA0PuX5q8Rq_RoeP7c7nXuepD86Dk,377
+simile/resource_agent.py,sha256=ZwFYRfRTIxjMFwZ8eFHMgArzFt8MJIUl7DTmhVrBtPU,4579
+simile/resource_population.py,sha256=SHyyBNfuwdrLtOdhLLVUyAs_8y-hs1sPcE6kbWjwWBA,4011
+simile/task.py,sha256=Fn40AHX5FYRDuGdIzWMtMOAjI5O_GHkFpE-li5Cpwck,2737
+simile/utils.py,sha256=1m3IIUY4kGOsy3nMijGWXVqy6MFekEl2IvSsaevNARQ,195
+simile-0.1.1.dist-info/LICENSE,sha256=SwJ_Xw9Vk_7LCC8ttVixbpNxJumTBv04H_gizLbDjkc,1071
+simile-0.1.1.dist-info/METADATA,sha256=klrHynWpxXPIS8I4vLaqwDvlsIVuUvFybfP3Wr2rud4,1421
+simile-0.1.1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+simile-0.1.1.dist-info/top_level.txt,sha256=41lJneubAG4-ZOAs5qn7iDtDb-MDxa6DdvgBKwNX84M,7
+simile-0.1.1.dist-info/RECORD,,

simile-0.1.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-simile/__init__.py,sha256=ru0KrsAf-hMJLigoRePoGt8rIA_q8GAaq5FgO42RD-U,1193
-simile/api_requestor.py,sha256=03SWFV5Nrc9w-4ZCJ29hWTJSN8paR26isTLLrwL0h_0,1546
-simile/config.py,sha256=q9twMCyF7jmzxWI0u1KDEXY-MBhHzcy3EiggwzAl-wU,624
-simile/error.py,sha256=Kw6qAtqp1xugiRmA0PuX5q8Rq_RoeP7c7nXuepD86Dk,377
-simile/resource_agent.py,sha256=DJC61cV2FoxaH6wZaluUiFCnZgzEoiJ07aqNShpqiCM,3701
-simile/resource_population.py,sha256=o7jx6HcoimZkz4ATsN1_KN5sufKaTog1trpHsc5LXB8,3153
-simile/task.py,sha256=TDC797_0L6YdsDadn91qdGqYzTgZyAURrVWwbNXm9hU,2656
-simile/utils.py,sha256=1m3IIUY4kGOsy3nMijGWXVqy6MFekEl2IvSsaevNARQ,195
-simile-0.1.0.dist-info/LICENSE,sha256=SwJ_Xw9Vk_7LCC8ttVixbpNxJumTBv04H_gizLbDjkc,1071
-simile-0.1.0.dist-info/METADATA,sha256=26D9jmP7X01XnQvJOuDRJ_qb7zSHJUPnq_fp_vFzTOU,1421
-simile-0.1.0.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-simile-0.1.0.dist-info/top_level.txt,sha256=41lJneubAG4-ZOAs5qn7iDtDb-MDxa6DdvgBKwNX84M,7
-simile-0.1.0.dist-info/RECORD,,