shaped 2.0.2__py3-none-any.whl → 2.0.5__py3-none-any.whl

shaped/autogen/models/view.py

@@ -1,15 +1,14 @@
 # coding: utf-8
 
 """
-    Shaped API
+ Shaped API
 
-    Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
+ Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
 
-    The version of the OpenAPI document: 2.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+ Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
-"""  # noqa: E501
+ Do not edit the class manually.
+""" # noqa: E501
 
 
 from __future__ import annotations
@@ -31,9 +30,9 @@ class View(BaseModel):
     created_at: StrictStr = Field(description="ISO timestamp when view was created.")
     type: StrictStr = Field(description="Type of view (SQL or AI_ENRICHMENT).")
     status: StrictStr = Field(description="Current deployment status of the view.")
-    source_datasets_names: List[StrictStr] = Field(description="List of source dataset names used by this view.")
+    source_table_names: List[StrictStr] = Field(description="List of source table names used by this view.")
     description: Optional[StrictStr] = None
-    __properties: ClassVar[List[str]] = ["name", "uri", "created_at", "type", "status", "source_datasets_names", "description"]
+    __properties: ClassVar[List[str]] = ["name", "uri", "created_at", "type", "status", "source_table_names", "description"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -96,7 +95,7 @@ class View(BaseModel):
             "created_at": obj.get("created_at"),
             "type": obj.get("type"),
             "status": obj.get("status"),
-            "source_datasets_names": obj.get("source_datasets_names"),
+            "source_table_names": obj.get("source_table_names"),
             "description": obj.get("description")
         })
         return _obj

shaped/autogen/models/view_details_ai.py

@@ -1,15 +1,14 @@
 # coding: utf-8
 
 """
-    Shaped API
+ Shaped API
 
-    Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
+ Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
 
-    The version of the OpenAPI document: 2.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+ Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
-"""  # noqa: E501
+ Do not edit the class manually.
+""" # noqa: E501
 
 
 from __future__ import annotations
@@ -20,8 +19,8 @@ import json
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
+from shaped.autogen.models.transform_status import TransformStatus
 from shaped.autogen.models.view_details_ai_schema_value import ViewDetailsAISchemaValue
-from shaped.autogen.models.view_status import ViewStatus
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -31,14 +30,14 @@ class ViewDetailsAI(BaseModel):
     """ # noqa: E501
     name: StrictStr = Field(description="Unique identifier for the view.")
     uri: StrictStr = Field(description="URI to access the view.")
-    status: ViewStatus = Field(description="Current deployment status.")
+    status: TransformStatus = Field(description="Current deployment status.")
     created_at: datetime = Field(description="Timestamp when view was created.")
     var_schema: Optional[Dict[str, ViewDetailsAISchemaValue]] = Field(default=None, alias="schema")
-    source_tables_names: List[StrictStr] = Field(description="List of source dataset names used by this view.")
+    source_table_names: List[StrictStr] = Field(description="List of source table names used by this view.")
     description: Optional[StrictStr] = None
     error_message: Optional[StrictStr] = None
     type: StrictStr = Field(description="View type discriminator for AI enrichment views.")
-    __properties: ClassVar[List[str]] = ["name", "uri", "status", "created_at", "schema", "source_tables_names", "description", "error_message", "type"]
+    __properties: ClassVar[List[str]] = ["name", "uri", "status", "created_at", "schema", "source_table_names", "description", "error_message", "type"]
 
     @field_validator('type')
     def type_validate_enum(cls, value):
@@ -130,7 +129,7 @@ class ViewDetailsAI(BaseModel):
             )
             if obj.get("schema") is not None
             else None,
-            "source_tables_names": obj.get("source_tables_names"),
+            "source_table_names": obj.get("source_table_names"),
             "description": obj.get("description"),
             "error_message": obj.get("error_message"),
             "type": obj.get("type")

shaped/autogen/models/view_details_ai_schema_value.py

@@ -1,15 +1,14 @@
 # coding: utf-8
 
 """
-    Shaped API
+ Shaped API
 
-    Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
+ Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
 
-    The version of the OpenAPI document: 2.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+ Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
-"""  # noqa: E501
+ Do not edit the class manually.
+""" # noqa: E501
 
 
 from __future__ import annotations

shaped/autogen/models/view_details_sql.py

@@ -1,15 +1,14 @@
 # coding: utf-8
 
 """
-    Shaped API
+ Shaped API
 
-    Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
+ Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
 
-    The version of the OpenAPI document: 2.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+ Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
-"""  # noqa: E501
+ Do not edit the class manually.
+""" # noqa: E501
 
 
 from __future__ import annotations
@@ -20,8 +19,8 @@ import json
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
+from shaped.autogen.models.transform_status import TransformStatus
 from shaped.autogen.models.view_details_ai_schema_value import ViewDetailsAISchemaValue
-from shaped.autogen.models.view_status import ViewStatus
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -31,14 +30,14 @@ class ViewDetailsSQL(BaseModel):
     """ # noqa: E501
     name: StrictStr = Field(description="Unique identifier for the view.")
     uri: StrictStr = Field(description="URI to access the view.")
-    status: ViewStatus = Field(description="Current deployment status.")
+    status: TransformStatus = Field(description="Current deployment status.")
     created_at: datetime = Field(description="Timestamp when view was created.")
     var_schema: Optional[Dict[str, ViewDetailsAISchemaValue]] = Field(default=None, alias="schema")
-    source_tables_names: List[StrictStr] = Field(description="List of source dataset names used by this view.")
+    source_table_names: List[StrictStr] = Field(description="List of source table names used by this view.")
     description: Optional[StrictStr] = None
     error_message: Optional[StrictStr] = None
     type: StrictStr = Field(description="View type discriminator for SQL views.")
-    __properties: ClassVar[List[str]] = ["name", "uri", "status", "created_at", "schema", "source_tables_names", "description", "error_message", "type"]
+    __properties: ClassVar[List[str]] = ["name", "uri", "status", "created_at", "schema", "source_table_names", "description", "error_message", "type"]
 
     @field_validator('type')
     def type_validate_enum(cls, value):
@@ -130,7 +129,7 @@ class ViewDetailsSQL(BaseModel):
             )
             if obj.get("schema") is not None
             else None,
-            "source_tables_names": obj.get("source_tables_names"),
+            "source_table_names": obj.get("source_table_names"),
             "description": obj.get("description"),
             "error_message": obj.get("error_message"),
             "type": obj.get("type")

shaped/autogen/models/weight_decay.py

@@ -1,15 +1,14 @@
 # coding: utf-8
 
 """
-    Shaped API
+ Shaped API
 
-    Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
+ Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
 
-    The version of the OpenAPI document: 2.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+ Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
-"""  # noqa: E501
+ Do not edit the class manually.
+""" # noqa: E501
 
 
 from __future__ import annotations

shaped/autogen/models/whitespace_tokenizer.py

@@ -1,15 +1,14 @@
 # coding: utf-8
 
 """
-    Shaped API
+ Shaped API
 
-    Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
+ Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
 
-    The version of the OpenAPI document: 2.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+ Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
-"""  # noqa: E501
+ Do not edit the class manually.
+""" # noqa: E501
 
 
 from __future__ import annotations

shaped/autogen/models/window_size.py

@@ -1,15 +1,14 @@
 # coding: utf-8
 
 """
-    Shaped API
+ Shaped API
 
-    Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
+ Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
 
-    The version of the OpenAPI document: 2.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+ Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
-"""  # noqa: E501
+ Do not edit the class manually.
+""" # noqa: E501
 
 
 from __future__ import annotations

shaped/autogen/rest.py

@@ -1,15 +1,14 @@
 # coding: utf-8
 
 """
-    Shaped API
+ Shaped API
 
-    Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
+ Welcome to Shaped's API reference docs. These provide a  detailed view of the endpoints and CLI commands that Shaped provides and brief  explanations of how they should be used.  The Shaped API has four main endpoints:  **Tables** - Provision and manage batch and real-time data connectors.   **Views** - Configure SQL transformations and AI enrichment on your input data. Use SQL to combine multiple data sources or use an LLM to add new categories, extract specific attributes from descriptions, etc.  **Engines** - Deploy and manage your relevance engines. The Engine API exposes configuration for indexing logic, input datasets, externam embeddings, and more.  **Query** - Execute queries against your engines, to return data based on an input query or rerank an existing list. The Query API exposes the retrieve, filter, score, and ranking steps of the 4-stage ranking architecture.  The base URL for each endpoint is: `https://api.shaped.ai/v2`
 
-    The version of the OpenAPI document: 2.0.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+ Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
-"""  # noqa: E501
+ Do not edit the class manually.
+""" # noqa: E501
 
 
 import io
@@ -48,12 +47,17 @@ class RESTResponse(io.IOBase):
             self.data = self.response.data
         return self.data
 
+    @property
+    def headers(self):
+        """Returns a dictionary of response headers."""
+        return self.response.headers
+
     def getheaders(self):
-        """Returns a dictionary of the response headers."""
+        """Returns a dictionary of the response headers; use ``headers`` instead."""
         return self.response.headers
 
     def getheader(self, name, default=None):
-        """Returns a given response header."""
+        """Returns a given response header; use ``headers.get()`` instead."""
         return self.response.headers.get(name, default)
 
 
@@ -76,13 +80,8 @@ class RESTClientObject:
             "ca_certs": configuration.ssl_ca_cert,
             "cert_file": configuration.cert_file,
             "key_file": configuration.key_file,
+            "ca_cert_data": configuration.ca_cert_data,
         }
-        # Only add ca_cert_data if urllib3 version supports it.
-        # urllib3 2.2+ may not support key_ca_cert_data parameter.
-        if configuration.ca_cert_data is not None:
-            # For urllib3 2.2+, use ca_certs or handle differently.
-            # Skip ca_cert_data to avoid PoolKey errors.
-            pass
         if configuration.assert_hostname is not None:
             pool_args['assert_hostname'] = (
                 configuration.assert_hostname

shaped/cli/shaped_cli.py

@@ -61,14 +61,79 @@ def _parse_response_as_yaml(content: str) -> str:
     return yaml.dump(json.loads(content), sort_keys=False)
 
 
+def _normalize_query_to_request(query_input: str) -> str:
+    """
+    Normalize query input to a QueryRequest JSON string.
+
+    The input can be:
+    - A SQL string (e.g., "SELECT * FROM table")
+    - A QueryConfig JSON object (e.g., {"type": "rank", ...})
+    - A full QueryRequest JSON object (e.g., {"query": "...", "return_metadata": true})
+    - Legacy format (e.g., {"sql": "SELECT * FROM table"})
+
+    Returns a JSON string representing a QueryRequest.
+
+    Raises:
+        ValueError: If the input is invalid or cannot be normalized.
+    """
+    if not query_input or not query_input.strip():
+        raise ValueError(
+            "Query input cannot be empty. Provide a SQL query string or "
+            "JSON query configuration."
+        )
+
+    # Try to parse as JSON first.
+    try:
+        parsed = json.loads(query_input)
+
+        # If it's already a QueryRequest (has 'query' field), use as-is.
+        if isinstance(parsed, dict) and "query" in parsed:
+            return json.dumps(parsed)
+
+        # Handle legacy {"sql": "..."} format.
+        if isinstance(parsed, dict) and "sql" in parsed:
+            sql_string = parsed["sql"]
+            if not isinstance(sql_string, str) or not sql_string.strip():
+                raise ValueError(
+                    "Invalid 'sql' field in query. Expected a non-empty SQL string."
+                )
+            # Merge any other fields (like return_metadata) if present.
+            request = {"query": sql_string, "return_metadata": True}
+            if "return_metadata" in parsed:
+                request["return_metadata"] = parsed["return_metadata"]
+            if "parameters" in parsed:
+                request["parameters"] = parsed["parameters"]
+            return json.dumps(request)
+
+        # If it's a dict but not a QueryRequest, wrap it as the query field.
+        if isinstance(parsed, dict):
+            return json.dumps({"query": parsed, "return_metadata": True})
+
+        # If it's a string in JSON (unlikely but possible), treat as SQL.
+        if isinstance(parsed, str):
+            return json.dumps({"query": parsed, "return_metadata": True})
+
+        # Other types, wrap as query.
+        return json.dumps({"query": parsed, "return_metadata": True})
+    except json.JSONDecodeError:
+        # Not valid JSON, treat as SQL string.
+        # This is expected for plain SQL queries, so we don't raise an error.
+        return json.dumps({"query": query_input, "return_metadata": True})
+    except ValueError as e:
+        # Re-raise ValueError with context.
+        raise ValueError(f"Invalid query input: {e}") from e
+
+
 @app.command()
 def init(
     api_key: str = typer.Option(..., "--api-key", help="Your Shaped API key."),
-    env: str = typer.Option("prod", "--env", help="Environment to use (e.g., prod, dev, staging)."),
+    env: str = typer.Option(
+        "prod", "--env", help="Environment to use (e.g., prod, dev, staging)."
+    ),
 ):
     """
     Initialize the Shaped CLI with your API key and environment.
-    
+
     This command saves your configuration locally so you don't need to
     provide your API key for every command.
     """
@@ -81,6 +146,7 @@ def init(
 # ENGINE API #
 ##############
 
+
 @app.command()
 def create_engine(
     file: typer.FileText = typer.Option(
@@ -89,7 +155,7 @@ def create_engine(
 ):
     """
     Create a new engine.
-    
+
     The engine configuration can be provided via:
     - --file: Path to a JSON/YAML file
     - stdin: Pipe JSON/YAML content
@@ -125,7 +191,7 @@ def update_engine(
 ):
     """
     Update an existing engine.
-    
+
     The engine configuration can be provided via:
     - --file: Path to a JSON/YAML file
     - stdin: Pipe JSON/YAML content
@@ -218,7 +284,7 @@ def create_table_from_uri(
 ):
     """
     Create a table from a data file and automatically insert the data.
-    
+
     The table schema is inferred from the first chunk of data.
     """
     chunks = _read_chunks(path, type, chunk_size=1)
@@ -249,7 +315,7 @@ def create_table(
 ):
     """
     Create a new table.
-    
+
     The table configuration can be provided via:
     - --file: Path to a JSON/YAML file
     - stdin: Pipe JSON/YAML content
@@ -321,7 +387,7 @@ def update_table(
 ):
     """
     Update an existing table.
-    
+
     The table configuration can be provided via:
     - --file: Path to a JSON/YAML file
     - stdin: Pipe JSON/YAML content
@@ -359,7 +425,7 @@ def table_insert(
 ):
     """
     Insert data into a table from a file.
-    
+
     Data is read in chunks and uploaded progressively with a progress bar.
     """
     config = _read_config()
@@ -383,7 +449,7 @@ def table_insert(
     # Chunk read and upload.
     for chunk in _read_chunks(file, type, chunk_size=1000):
         _write_chunk(chunk)
-    
+
     bar.close()
 
 
@@ -440,7 +506,7 @@ def create_view(
 ):
     """
     Create a new view.
-    
+
     The view configuration can be provided via:
     - --file: Path to a JSON/YAML file
     - stdin: Pipe JSON/YAML content
@@ -513,7 +579,7 @@ def update_view(
 ):
     """
     Update an existing view.
-    
+
     The view configuration can be provided via:
     - --file: Path to a JSON/YAML file
     - stdin: Pipe JSON/YAML content
@@ -566,20 +632,22 @@ def delete_view(
 
 @app.command()
 def query(
-    engine_name: str = typer.Option(..., help="Name of the engine to execute the query against."),
+    engine_name: str = typer.Option(
+        ..., help="Name of the engine to execute the query against."
+    ),
     query_file: typer.FileText = typer.Option(
         None, help="Path to a JSON or YAML file containing the query."
     ),
     query: str = typer.Option(
-        None, help="JSON string containing the query. Can be used instead of --query-file."
+        None, help="Query string (SQL or JSON). Can be used instead of --query-file."
     ),
 ):
     """
     Execute an ad-hoc query against an engine.
-    
+
     The query can be provided via:
     - --query-file: Path to a JSON/YAML file
-    - --query: JSON string directly
+    - --query: SQL query string or JSON string containing the query
     - stdin: Pipe JSON/YAML content
     """
     config = _read_config()
@@ -590,28 +658,79 @@ def query(
         "x-api-key": config.api_key,
     }
 
-    if not sys.stdin.isatty():
-        payload = sys.stdin.read()
-    elif query_file is not None:
-        payload = _parse_file_as_json(query_file)
-    elif query is not None:
-        payload = query
-    else:
-        raise ValueError(
-            "Must provide either a '--query-file', '--query' JSON string, or stdin input."
-        )
+    try:
+        # Check stdin only if no other input options are provided.
+        # If stdin is not a TTY, peek to see if there's content.
+        stdin_has_content = False
+        stdin_content = ""
+        if not sys.stdin.isatty() and query_file is None and query is None:
+            # Only read from stdin if no other options provided.
+            stdin_content = sys.stdin.read()
+            stdin_has_content = bool(stdin_content.strip())
+            if not stdin_has_content:
+                raise ValueError(
+                    "No input provided via stdin. Provide a SQL query string or "
+                    "JSON query configuration."
+                )
+
+        if stdin_has_content:
+            # Read from stdin and normalize to QueryRequest.
+            payload = _normalize_query_to_request(stdin_content)
+        elif query_file is not None:
+            # Read file content and normalize to QueryRequest.
+            # Files can contain SQL strings or JSON/YAML.
+            try:
+                # Try to parse as JSON/YAML first.
+                query_file.seek(0)
+                file_content = _parse_file_as_json(query_file)
+            except (ValueError, json.JSONDecodeError, yaml.YAMLError) as e:
+                # If parsing fails, read as raw content (e.g., SQL string).
+                query_file.seek(0)
+                file_content = query_file.read()
+                if not file_content.strip():
+                    raise ValueError(
+                        f"File '{query_file.name}' is empty or could not be parsed. "
+                        "Provide a SQL query string or valid JSON/YAML configuration."
+                    ) from e
+            payload = _normalize_query_to_request(file_content)
+        elif query is not None:
+            # Normalize CLI string input to QueryRequest.
+            payload = _normalize_query_to_request(query)
+        else:
+            raise ValueError(
+                "Must provide query input via one of:\n"
+                "  - --query-file: Path to a file containing SQL or JSON/YAML\n"
+                "  - --query: SQL query string or JSON string\n"
+                "  - stdin: Pipe SQL or JSON/YAML content"
+            )
+    except ValueError as e:
+        typer.echo(f"Error: {e}", err=True)
+        raise typer.Exit(1)
+    except Exception as e:
+        typer.echo(f"Error: Unexpected error processing query input: {e}", err=True)
+        raise typer.Exit(1)
 
     typer.echo(payload)
     response = requests.post(url, headers=headers, data=payload)
     if response.status_code != 200:
-        typer.echo(f"Error: {response.status_code}\n{response.text}")
+        # Try to parse error response for better error message.
+        try:
+            error_data = response.json()
+            error_msg = error_data.get(
+                "message", error_data.get("detail", response.text)
+            )
+            typer.echo(f"Error {response.status_code}: {error_msg}", err=True)
+        except (json.JSONDecodeError, ValueError):
+            typer.echo(f"Error {response.status_code}: {response.text}", err=True)
         raise typer.Exit(1)
     typer.echo(_parse_response_as_yaml(response.text))
 
 
 @app.command()
 def execute_saved_query(
-    engine_name: str = typer.Option(..., help="Name of the engine containing the saved query."),
+    engine_name: str = typer.Option(
+        ..., help="Name of the engine containing the saved query."
+    ),
     query_name: str = typer.Option(..., help="Name of the saved query to execute."),
 ):
     """
@@ -633,7 +752,9 @@ def execute_saved_query(
 
 @app.command()
 def view_saved_query(
-    engine_name: str = typer.Option(..., help="Name of the engine containing the saved query."),
+    engine_name: str = typer.Option(
+        ..., help="Name of the engine containing the saved query."
+    ),
     query_name: str = typer.Option(..., help="Name of the saved query to view."),
 ):
     """
@@ -651,7 +772,9 @@ def view_saved_query(
 
 @app.command()
 def list_saved_queries(
-    engine_name: str = typer.Option(..., help="Name of the engine to list saved queries for."),
+    engine_name: str = typer.Option(
+        ..., help="Name of the engine to list saved queries for."
+    ),
 ):
     """
     List all saved queries for an engine.