pytrilogy 0.0.2.55__tar.gz → 0.0.2.57__tar.gz

{pytrilogy-0.0.2.55/pytrilogy.egg-info → pytrilogy-0.0.2.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.2.55
+Version: 0.0.2.57
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.2.55
+Version: 0.0.2.57
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57}/tests/test_models.py

@@ -147,12 +147,14 @@ def test_select(test_environment: Environment):
     pid = test_environment.concepts["product_id"]
     cid = test_environment.concepts["category_id"]
     cname = test_environment.concepts["category_name"]
-    x = SelectStatement(selection=[oid, pid, cid, cname])
+    x = SelectStatement(
+        selection=[oid, pid, cid, cname], grain=Grain(components=[oid, pid, cid])
+    )
     ds = x.to_datasource(
         test_environment.namespace, "test", address=Address(location="test")
     )
 
-    assert ds.grain == Grain(components=[oid, pid, cid])
+    assert ds.grain.components == Grain(components=[oid, pid, cid]).components
 
 
 def test_undefined(test_environment: Environment):

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57}/tests/test_select.py

@@ -1,5 +1,5 @@
 # from trilogy.compiler import compile
-from trilogy import Dialects
+from trilogy import Dialects, Environment
 from trilogy.core.models import Grain, SelectStatement
 from trilogy.core.query_processor import process_query
 from trilogy.dialect.bigquery import BigqueryDialect
@@ -176,3 +176,35 @@ select id + 2 as three;
 
     result = Dialects.DUCK_DB.default_executor(environment=env).execute_text(q1)[-1]
     assert result.fetchone().three == 3
+
+
+def test_select_from_components():
+    env = Environment()
+    q1 = """
+
+key id int;
+property id.class int;
+property id.name string;
+
+select
+    class,
+    upper(id.name)-> upper_name,
+    count(id) ->class_id_count,
+;
+"""
+    env, statements = env.parse(q1)
+
+    select: SelectStatement = statements[-1]
+
+    assert select.grain.components == {"local.class", "local.upper_name"}
+    assert select.local_concepts["local.class_id_count"].grain.components == {
+        "local.class",
+        "local.upper_name",
+    }
+
+    # SelectStatement.from_inputs(
+    #     environment=env,
+    #     selection=[SelectItem(concept=env.concepts["id"]),
+    #                SelectItem(concept=env.concepts["id.class"])],
+    #     input_components=[],
+    # )

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57}/trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.dialect.enums import Dialects
 from trilogy.executor import Executor
 from trilogy.parser import parse
 
-__version__ = "0.0.2.55"
+__version__ = "0.0.2.57"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57}/trilogy/core/environment_helpers.py

@@ -11,12 +11,23 @@ from trilogy.core.models import (
 )
 from trilogy.parsing.common import Meta, arg_to_datatype, process_function_args
 
+FUNCTION_DESCRIPTION_MAPS = {
+    FunctionType.DATE: "The date part of a timestamp/date. Integer, 0-31 depending on month.",
+    FunctionType.MONTH: "The month part of a timestamp/date. Integer, 1-12.",
+    FunctionType.YEAR: "The year part of a timestamp/date. Integer.",
+    FunctionType.QUARTER: "The quarter part of a timestamp/date. Integer, 1-4.",
+    FunctionType.DAY_OF_WEEK: "The day of the week part of a timestamp/date. Integer, 0-6.",
+    FunctionType.HOUR: "The hour part of a timestamp. Integer, 0-23.",
+    FunctionType.MINUTE: "The minute part of a timestamp. Integer, 0-59.",
+    FunctionType.SECOND: "The second part of a timestamp. Integer, 0-59.",
+}
+
 
 def generate_date_concepts(concept: Concept, environment: Environment):
     if concept.metadata and concept.metadata.description:
         base_description = concept.metadata.description
     else:
-        base_description = f"a {concept.datatype.value}"
+        base_description = f"a {concept.address}"
     if concept.metadata and concept.metadata.line_number:
         base_line_number = concept.metadata.line_number
     else:
@@ -54,7 +65,7 @@ def generate_date_concepts(concept: Concept, environment: Environment):
                 concept.address,
             ),
             metadata=Metadata(
-                description=f"Auto-derived. Integer format. The {ftype.value} derived from {concept.name}, {base_description}",
+                description=f"Auto-derived from {base_description}. {FUNCTION_DESCRIPTION_MAPS.get(ftype, ftype.value)}. ",
                 line_number=base_line_number,
                 concept_source=ConceptSource.AUTO_DERIVED,
             ),
@@ -68,7 +79,7 @@ def generate_datetime_concepts(concept: Concept, environment: Environment):
     if concept.metadata and concept.metadata.description:
         base_description = concept.metadata.description
     else:
-        base_description = f"a {concept.datatype.value}"
+        base_description = concept.address
     if concept.metadata and concept.metadata.line_number:
         base_line_number = concept.metadata.line_number
     else:
@@ -105,7 +116,7 @@ def generate_datetime_concepts(concept: Concept, environment: Environment):
                 concept.address,
             ),
             metadata=Metadata(
-                description=f"Auto-derived. Integer format. The {ftype.value} derived from {concept.name}, {base_description}",
+                description=f"Auto-derived from {base_description}. {FUNCTION_DESCRIPTION_MAPS.get(ftype, ftype.value)}.",
                 line_number=base_line_number,
                 concept_source=ConceptSource.AUTO_DERIVED,
             ),
@@ -147,7 +158,7 @@ def generate_key_concepts(concept: Concept, environment: Environment):
                 concept.address,
             },
             metadata=Metadata(
-                description=f"Auto-derived. Integer format. The {ftype.value} derived from {concept.name}, {base_description}",
+                description=f"Auto-derived integer. The {ftype.value} of {concept.address}, {base_description}",
                 line_number=base_line_number,
                 concept_source=ConceptSource.AUTO_DERIVED,
             ),

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57}/trilogy/core/functions.py

@@ -127,10 +127,11 @@ def Unnest(args: list[Concept]) -> Function:
 
 def Group(args: list[Concept]) -> Function:
     output = args[0]
+    datatype = arg_to_datatype(output)
     return Function(
         operator=FunctionType.GROUP,
         arguments=args,
-        output_datatype=output.datatype,
+        output_datatype=datatype,
         output_purpose=Purpose.PROPERTY,
         arg_count=-1,
     )

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57}/trilogy/core/models.py

@@ -620,7 +620,7 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
             )
         final_grain = self.grain or grain
         keys = self.keys if self.keys else None
-        if self.is_aggregate and isinstance(new_lineage, Function):
+        if self.is_aggregate and isinstance(new_lineage, Function) and grain.components:
             grain_components = [environment.concepts[c] for c in grain.components]
             new_lineage = AggregateWrapper(function=new_lineage, by=grain_components)
             final_grain = grain
@@ -923,9 +923,16 @@ class Grain(Namespaced, BaseModel):
             if not self.where_clause:
                 where = other.where_clause
             elif not other.where_clause == self.where_clause:
-                raise NotImplementedError(
-                    f"Cannot merge grains with where clauses, self {self.where_clause} other {other.where_clause}"
+                where = WhereClause(
+                    conditional=Conditional(
+                        left=self.where_clause.conditional,
+                        right=other.where_clause.conditional,
+                        operator=BooleanOperator.AND,
+                    )
                 )
+                # raise NotImplementedError(
+                #     f"Cannot merge grains with where clauses, self {self.where_clause} other {other.where_clause}"
+                # )
         return Grain(
             components=self.components.union(other.components), where_clause=where
         )
@@ -1015,6 +1022,7 @@ class EnvironmentConceptDict(dict):
     def raise_undefined(
         self, key: str, line_no: int | None = None, file: Path | str | None = None
     ) -> Never:
+
         matches = self._find_similar_concepts(key)
         message = f"Undefined concept: {key}."
         if matches:
@@ -1660,6 +1668,96 @@ class SelectStatement(HasUUID, Mergeable, Namespaced, SelectTypeMixin, BaseModel
     ] = Field(default_factory=EnvironmentConceptDict)
     grain: Grain = Field(default_factory=Grain)
 
+    @classmethod
+    def from_inputs(
+        cls,
+        environment: Environment,
+        selection: List[SelectItem],
+        order_by: OrderBy | None = None,
+        limit: int | None = None,
+        meta: Metadata | None = None,
+        where_clause: WhereClause | None = None,
+        having_clause: HavingClause | None = None,
+    ) -> "SelectStatement":
+
+        output = SelectStatement(
+            selection=selection,
+            where_clause=where_clause,
+            having_clause=having_clause,
+            limit=limit,
+            order_by=order_by,
+            meta=meta or Metadata(),
+        )
+        for parse_pass in [
+            1,
+            2,
+        ]:
+            # the first pass will result in all concepts being defined
+            # the second will get grains appropriately
+            # eg if someone does sum(x)->a, b+c -> z - we don't know if Z is a key to group by or an aggregate
+            # until after the first pass, and so don't know the grain of a
+
+            if parse_pass == 1:
+                grain = Grain.from_concepts(
+                    [
+                        x.content
+                        for x in output.selection
+                        if isinstance(x.content, Concept)
+                    ],
+                    where_clause=output.where_clause,
+                )
+            if parse_pass == 2:
+                grain = Grain.from_concepts(
+                    output.output_components, where_clause=output.where_clause
+                )
+            output.grain = grain
+            pass_grain = Grain() if parse_pass == 1 else grain
+            for item in selection:
+                # we don't know the grain of an aggregate at assignment time
+                # so rebuild at this point in the tree
+                # TODO: simplify
+                if isinstance(item.content, ConceptTransform):
+                    new_concept = item.content.output.with_select_context(
+                        output.local_concepts,
+                        # the first pass grain will be incorrect
+                        pass_grain,
+                        environment=environment,
+                    )
+                    output.local_concepts[new_concept.address] = new_concept
+                    item.content.output = new_concept
+                    if parse_pass == 2 and CONFIG.select_as_definition:
+                        environment.add_concept(new_concept)
+                elif isinstance(item.content, UndefinedConcept):
+                    environment.concepts.raise_undefined(
+                        item.content.address,
+                        line_no=item.content.metadata.line_number,
+                        file=environment.env_file_path,
+                    )
+                elif isinstance(item.content, Concept):
+                    # Sometimes cached values here don't have the latest info
+                    # but we can't just use environment, as it might not have the right grain.
+                    item.content = item.content.with_select_context(
+                        output.local_concepts,
+                        pass_grain,
+                        environment=environment,
+                    )
+                    output.local_concepts[item.content.address] = item.content
+
+        if order_by:
+            output.order_by = order_by.with_select_context(
+                local_concepts=output.local_concepts,
+                grain=output.grain,
+                environment=environment,
+            )
+        if output.having_clause:
+            output.having_clause = output.having_clause.with_select_context(
+                local_concepts=output.local_concepts,
+                grain=output.grain,
+                environment=environment,
+            )
+        output.validate_syntax(environment)
+        return output
+
     def validate_syntax(self, environment: Environment):
         if self.where_clause:
             for x in self.where_clause.concept_arguments:
@@ -2091,6 +2189,10 @@ class Datasource(HasUUID, Namespaced, BaseModel):
     def duplicate(self) -> Datasource:
         return self.model_copy(deep=True)
 
+    @property
+    def hidden_concepts(self) -> List[Concept]:
+        return []
+
     def merge_concept(
         self, source: Concept, target: Concept, modifiers: List[Modifier]
     ):
@@ -2163,17 +2265,7 @@ class Datasource(HasUUID, Namespaced, BaseModel):
     @field_validator("grain", mode="before")
     @classmethod
     def grain_enforcement(cls, v: Grain, info: ValidationInfo):
-        values = info.data
         grain: Grain = safe_grain(v)
-        if not grain.components:
-            columns: List[ColumnAssignment] = values.get("columns", [])
-            grain = Grain.from_concepts(
-                [
-                    c.concept.with_grain(Grain())
-                    for c in columns
-                    if c.concept.purpose == Purpose.KEY
-                ]
-            )
         return grain
 
     def add_column(
@@ -2982,12 +3074,18 @@ class CTE(BaseModel):
                 assert isinstance(c.lineage, RowsetItem)
                 return check_is_not_in_group(c.lineage.content)
             if c.derivation == PurposeLineage.CONSTANT:
-                return False
+                return True
             if c.purpose == Purpose.METRIC:
                 return True
-            elif c.derivation == PurposeLineage.BASIC and c.lineage:
+
+            if c.derivation == PurposeLineage.BASIC and c.lineage:
                 if all([check_is_not_in_group(x) for x in c.lineage.concept_arguments]):
                     return True
+                if (
+                    isinstance(c.lineage, Function)
+                    and c.lineage.operator == FunctionType.GROUP
+                ):
+                    return check_is_not_in_group(c.lineage.concept_arguments[0])
             return False
 
         return (
@@ -3264,6 +3362,7 @@ class Environment(BaseModel):
     alias_origin_lookup: Dict[str, Concept] = Field(default_factory=dict)
     # TODO: support freezing environments to avoid mutation
     frozen: bool = False
+    env_file_path: Path | None = None
 
     def freeze(self):
         self.frozen = True
@@ -3317,7 +3416,7 @@ class Environment(BaseModel):
             path = Path(path)
         with open(path, "r") as f:
             read = f.read()
-        return Environment(working_path=Path(path).parent).parse(read)[0]
+        return Environment(working_path=path.parent, env_file_path=path).parse(read)[0]
 
     @classmethod
     def from_string(cls, input: str) -> "Environment":
@@ -3664,6 +3763,7 @@ class Environment(BaseModel):
         for k, v in self.concepts.items():
             if v.address == target.address:
                 v.pseudonyms.add(source.address)
+
             if v.address == source.address:
                 replacements[k] = target
                 v.pseudonyms.add(target.address)

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57}/trilogy/core/processing/concept_strategies_v3.py

@@ -539,11 +539,14 @@ def validate_concept(
             found_addresses.add(concept.address)
             found_map[str(node)].add(concept)
     for v_address in concept.pseudonyms:
+        if v_address in seen:
+            return
         v = environment.concepts[v_address]
-        if v == concept.address:
+        if v.address in seen:
             return
-        if v in seen:
+        if v.address == concept.address:
             return
+
         validate_concept(
             v,
             node,
@@ -866,6 +869,7 @@ def _search_concepts(
         )
         if complete == ValidationResult.INCOMPLETE_CONDITION:
             cond_dict = {str(node): node.preexisting_conditions for node in stack}
+            logger.error(f"Have {cond_dict} and need {str(conditions)}")
             raise SyntaxError(f"Have {cond_dict} and need {str(conditions)}")
         # early exit if we have a complete stack with one node
         # we can only early exit if we have a complete stack
@@ -987,17 +991,20 @@ def source_query_concepts(
         raise ValueError(
             f"Could not resolve conections between {error_strings} from environment graph."
         )
-    candidate = GroupNode(
-        output_concepts=[
-            x for x in root.output_concepts if x.address not in root.hidden_concepts
-        ],
-        input_concepts=[
-            x for x in root.output_concepts if x.address not in root.hidden_concepts
-        ],
+    final = [x for x in root.output_concepts if x.address not in root.hidden_concepts]
+    if GroupNode.check_if_required(
+        downstream_concepts=final,
+        parents=[root.resolve()],
         environment=environment,
-        parents=[root],
-        partial_concepts=root.partial_concepts,
-    )
-    if not candidate.resolve().group_required:
-        return root
+    ).required:
+        candidate: StrategyNode = GroupNode(
+            output_concepts=final,
+            input_concepts=final,
+            environment=environment,
+            parents=[root],
+            partial_concepts=root.partial_concepts,
+        )
+    else:
+        candidate = root
+
     return candidate

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57}/trilogy/core/processing/node_generators/basic_node.py

@@ -13,6 +13,7 @@ from trilogy.core.processing.node_generators.common import (
     resolve_function_parent_concepts,
 )
 from trilogy.core.processing.nodes import History, StrategyNode
+from trilogy.utility import unique
 
 LOGGER_PREFIX = "[GEN_BASIC_NODE]"
 
@@ -65,7 +66,9 @@ def gen_basic_node(
     non_equivalent_optional = [
         x for x in local_optional if x not in equivalent_optional
     ]
-    all_parents = parent_concepts + non_equivalent_optional
+    all_parents: list[Concept] = unique(
+        parent_concepts + non_equivalent_optional, "address"
+    )
     logger.info(
         f"{depth_prefix}{LOGGER_PREFIX} Fetching parents {[x.address for x in all_parents]}"
     )

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57}/trilogy/core/processing/node_generators/filter_node.py

@@ -60,7 +60,7 @@ def gen_filter_node(
         g=g,
         depth=depth + 1,
         history=history,
-        # conditions=conditions,
+        conditions=conditions,
     )
 
     flattened_existence = [x for y in parent_existence_concepts for x in y]
@@ -194,6 +194,9 @@ def gen_filter_node(
         history=history,
         conditions=conditions,
     )
+    logger.info(
+        f"{padding(depth)}{LOGGER_PREFIX} returning filter node and enrich node with {enrich_node.output_concepts} and {enrich_node.input_concepts}"
+    )
     return MergeNode(
         input_concepts=[concept, immediate_parent] + local_optional,
         output_concepts=[
@@ -206,4 +209,5 @@ def gen_filter_node(
             filter_node,
             enrich_node,
         ],
+        preexisting_conditions=conditions.conditional if conditions else None,
     )

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57}/trilogy/core/processing/node_generators/group_to_node.py

@@ -26,6 +26,7 @@ def gen_group_to_node(
     # aggregates MUST always group to the proper grain
     if not isinstance(concept.lineage, Function):
         raise SyntaxError("Group to should have function lineage")
+    group_arg = concept.lineage.arguments[0]
     parent_concepts: List[Concept] = concept.lineage.concept_arguments
     logger.info(
         f"{padding(depth)}{LOGGER_PREFIX} group by node has required parents {[x.address for x in parent_concepts]}"
@@ -47,6 +48,13 @@ def gen_group_to_node(
         environment=environment,
         parents=parents,
         depth=depth,
+        preexisting_conditions=conditions.conditional if conditions else None,
+        hidden_concepts=(
+            [group_arg]
+            if isinstance(group_arg, Concept)
+            and group_arg.address not in local_optional
+            else []
+        ),
     )
 
     # early exit if no optional
@@ -62,6 +70,7 @@ def gen_group_to_node(
         g=g,
         depth=depth + 1,
         history=history,
+        conditions=conditions,
     )
     if not enrich_node:
         logger.info(
@@ -83,4 +92,5 @@ def gen_group_to_node(
         ],
         whole_grain=True,
         depth=depth,
+        preexisting_conditions=conditions.conditional if conditions else None,
     )

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57}/trilogy/core/processing/node_generators/multiselect_node.py

@@ -69,6 +69,7 @@ def gen_multiselect_node(
     lineage: MultiSelectStatement = concept.lineage
 
     base_parents: List[StrategyNode] = []
+    partial = []
     for select in lineage.selects:
         snode: StrategyNode = source_concepts(
             mandatory_list=select.output_components,
@@ -103,6 +104,9 @@ def gen_multiselect_node(
         for mc in merge_concepts:
             assert mc in snode.resolve().output_concepts
         base_parents.append(snode)
+        if select.where_clause:
+            for item in select.output_components:
+                partial.append(item)
 
     node_joins = extra_align_joins(lineage, base_parents)
     node = MergeNode(
@@ -112,35 +116,28 @@ def gen_multiselect_node(
         depth=depth,
         parents=base_parents,
         node_joins=node_joins,
+        hidden_concepts=[x for y in base_parents for x in y.hidden_concepts],
     )
 
     enrichment = set([x.address for x in local_optional])
 
-    rowset_relevant = [
+    multiselect_relevant = [
         x
         for x in lineage.derived_concepts
         if x.address == concept.address or x.address in enrichment
     ]
-    additional_relevant = [
-        x for x in select.output_components if x.address in enrichment
-    ]
+    additional_relevant = [x for x in node.output_concepts if x.address in enrichment]
     # add in other other concepts
-    for item in rowset_relevant:
-        node.output_concepts.append(item)
-    for item in additional_relevant:
-        node.output_concepts.append(item)
-    if select.where_clause:
-        for item in additional_relevant:
-            node.partial_concepts.append(item)
 
-    # we need a better API for refreshing a nodes QDS
-    node.resolution_cache = node._resolve()
+    node.set_output_concepts(multiselect_relevant + additional_relevant)
 
-    # assume grain to be output of select
-    # but don't include anything aggregate at this point
-    node.resolution_cache.grain = Grain.from_concepts(
-        node.output_concepts,
-    )
+    # node.add_partial_concepts(partial)
+    # if select.where_clause:
+    #     for item in additional_relevant:
+    #         node.partial_concepts.append(item)
+    node.grain = Grain.from_concepts(node.output_concepts, environment=environment)
+    node.rebuild_cache()
+    # we need a better API for refreshing a nodes QDS
     possible_joins = concept_to_relevant_joins(additional_relevant)
     if not local_optional:
         logger.info(
@@ -159,6 +156,7 @@ def gen_multiselect_node(
             f"{padding(depth)}{LOGGER_PREFIX} all enriched concepts returned from base rowset node; exiting early"
         )
         return node
+
     enrich_node: MergeNode = source_concepts(  # this fetches the parent + join keys
         # to then connect to the rest of the query
         mandatory_list=additional_relevant + local_optional,

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57}/trilogy/core/processing/node_generators/rowset_node.py

@@ -103,6 +103,7 @@ def gen_rowset_node(
         )
         return node
     if any(x.derivation == PurposeLineage.ROWSET for x in possible_joins):
+
         logger.info(
             f"{padding(depth)}{LOGGER_PREFIX} cannot enrich rowset node with rowset concepts; exiting early"
         )

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57}/trilogy/core/processing/node_generators/select_merge_node.py

@@ -240,10 +240,12 @@ def create_datasource_node(
     depth: int,
     conditions: WhereClause | None = None,
 ) -> tuple[StrategyNode, bool]:
-    target_grain = Grain.from_concepts(all_concepts)
+    target_grain = Grain.from_concepts(all_concepts, environment=environment)
     force_group = False
     if not datasource.grain.issubset(target_grain):
         force_group = True
+    if not datasource.grain.components:
+        force_group = True
     partial_concepts = [
         c.concept
         for c in datasource.columns
@@ -350,6 +352,9 @@ def create_select_node(
 
     # we need to nest the group node one further
     if force_group is True:
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} source requires group before consumption."
+        )
         candidate: StrategyNode = GroupNode(
             output_concepts=all_concepts,
             input_concepts=all_concepts,
@@ -359,8 +364,10 @@ def create_select_node(
             partial_concepts=bcandidate.partial_concepts,
             nullable_concepts=bcandidate.nullable_concepts,
             preexisting_conditions=bcandidate.preexisting_conditions,
+            force_group=force_group,
         )
     else:
+
         candidate = bcandidate
     return candidate
 

{pytrilogy-0.0.2.55 → pytrilogy-0.0.2.57}/trilogy/core/processing/nodes/base_node.py

@@ -192,6 +192,8 @@ class StrategyNode:
         for x in self.parents:
             for z in x.usable_outputs:
                 non_hidden.add(z.address)
+                for psd in z.pseudonyms:
+                    non_hidden.add(psd)
         if not all([x.address in non_hidden for x in self.input_concepts]):
             missing = [x for x in self.input_concepts if x.address not in non_hidden]
             raise ValueError(
@@ -210,6 +212,8 @@ class StrategyNode:
         return self
 
     def add_condition(self, condition: Conditional | Comparison | Parenthetical):
+        if self.conditions and condition == self.conditions:
+            return self
         if self.conditions:
             self.conditions = Conditional(
                 left=self.conditions, right=condition, operator=BooleanOperator.AND
@@ -244,6 +248,15 @@ class StrategyNode:
             self.rebuild_cache()
         return self
 
+    def add_partial_concepts(self, concepts: List[Concept], rebuild: bool = True):
+        for concept in concepts:
+            if concept.address not in self.partial_lcl.addresses:
+                self.partial_concepts.append(concept)
+        self.partial_lcl = LooseConceptList(concepts=self.partial_concepts)
+        if rebuild:
+            self.rebuild_cache()
+        return self
+
     def add_existence_concepts(self, concepts: List[Concept], rebuild: bool = True):
         for concept in concepts:
             if concept.address not in self.output_concepts: