natural-agi-common 0.1.33__py3-none-any.whl → 0.1.35__py3-none-any.whl

common/model/point.py

@@ -6,6 +6,8 @@ class Point:
     id: str
     x: float
     y: float
+    normalized_x: float
+    normalized_y: float
 
     @classmethod
     def from_node_data(cls, node_data: dict) -> "Point":
@@ -13,6 +15,8 @@ class Point:
             x=node_data["x"],
             y=node_data["y"],
             id=node_data["id"],
+            normalized_x=node_data["normalized_x"],
+            normalized_y=node_data["normalized_y"],
         )
 
     def __hash__(self):

common/traversal/graph_traversal.py

@@ -1,10 +1,18 @@
-from typing import Generator, Any, Tuple, Optional
+from typing import Generator, Any, Tuple, Optional, List
+from dataclasses import dataclass
 import networkx as nx
 import logging
 from ..model.point import Point
 from ..model.vector import Vector
 
 
+@dataclass
+class TraversalSequence:
+    start_point: Point
+    vector: Vector
+    end_point: Point
+
+
 class GraphTraversal:
     def __init__(self, graph: nx.Graph):
         self.graph = graph
@@ -12,38 +20,51 @@ class GraphTraversal:
 
     def dfs_traversal(
         self, start_node: Any
-    ) -> Generator[Tuple[Point, Optional[Vector]], None, None]:
-        visited_vector = set()
-        for edge in nx.dfs_edges(self.graph, start_node):
-            self.logger.info(f"Visiting edge: {edge}")
-            source_node, target_node = edge
-            if source_node in visited_vector or target_node in visited_vector:
-                self.logger.info(f"Skipping edge: {edge} because vector was already visited")
-                continue
-
-            # Convert to your Point and Vector objects
-            source_data = self.graph.nodes[source_node]
-            target_data = self.graph.nodes[target_node]
-
-            point = None
-            vector = None
-
-            if self._is_point(source_data):
-                point = Point.from_node_data(source_data)
-            elif self._is_vector(source_data):
-                vector = Vector.from_node_data(source_data)
-                visited_vector.add(source_node)
-
-            if self._is_point(target_data):
-                point = Point.from_node_data(target_data)
-            elif self._is_vector(target_data):
-                vector = Vector.from_node_data(target_data)
-                visited_vector.add(target_node)
-
-            if point is None and vector is None:
-                raise ValueError(f"Invalid node data: {source_data} or {target_data}")
-
-            yield point, vector
+    ) -> Generator[TraversalSequence, None, None]:
+        visited_vectors = set()
+        visited_nodes = set()
+
+        def dfs_recursive(current_node: Any, path: List[Any]) -> None:
+            if current_node in visited_nodes:
+                return
+
+            visited_nodes.add(current_node)
+            path.append(current_node)
+
+            # If we have a sequence of 3 nodes, check if it follows point-vector-point pattern
+            if len(path) >= 3:
+                start_node_id = path[-3]
+                vector_node_id = path[-2]
+                end_node_id = path[-1]
+
+                start_data = self.graph.nodes[start_node_id]
+                vector_data = self.graph.nodes[vector_node_id]
+                end_data = self.graph.nodes[end_node_id]
+
+                # Check if sequence follows point-vector-point pattern
+                if (
+                    self._is_point(start_data)
+                    and self._is_vector(vector_data)
+                    and self._is_point(end_data)
+                    and vector_node_id not in visited_vectors
+                ):
+                    self.logger.info(
+                        f"Found sequence: {start_node_id} -> {vector_node_id} -> {end_node_id}"
+                    )
+                    visited_vectors.add(vector_node_id)
+
+                    start_point = Point.from_node_data(start_data)
+                    vector = Vector.from_node_data(vector_data)
+                    end_point = Point.from_node_data(end_data)
+
+                    yield TraversalSequence(start_point, vector, end_point)
+
+            # Continue DFS to neighbors
+            for neighbor in self.graph.neighbors(current_node):
+                if neighbor not in visited_nodes:
+                    yield from dfs_recursive(neighbor, path.copy())
+
+        yield from dfs_recursive(start_node, [])
 
     def _is_vector(self, node_data: dict) -> bool:
         return "Vector" in node_data["labels"]

common/traversal/visitors/angle_visitor.py

@@ -29,8 +29,8 @@ class AngleVisitor(Visitor):
             return {"angles": angles, "point_id": point.id}
         return None
 
-    def visit_line(self, line: Vector) -> Dict[str, Any]:
-        angle_with_ox = self._calculate_angle_with_ox(line)
+    def visit_line(self, line: Vector, start_point: Point) -> Dict[str, Any]:
+        angle_with_ox = self._calculate_angle_with_ox(line, start_point)
         self.line_angles[line.id] = angle_with_ox
         self.graph.nodes[line.id]["angle_with_ox"] = angle_with_ox
         return {"angle_with_ox": angle_with_ox, "line_id": line.id}
@@ -159,8 +159,14 @@ class AngleVisitor(Visitor):
         angle2 = round(angle2 / 10) * 10
         return [angle1, angle2]
 
-    def _calculate_angle_with_ox(self, line: Vector) -> float:
-        vector = (line.x2 - line.x1, line.y2 - line.y1)
+    def _calculate_angle_with_ox(self, line: Vector, start_point: Point) -> float:
+        start_coords = (start_point.x, start_point.y)
+        end_coords = (
+            (line.x2, line.y2)
+            if line.x1 == start_point.x and line.y1 == start_point.y
+            else (line.x1, line.y1)
+        )
+        vector = (end_coords[0] - start_coords[0], end_coords[1] - start_coords[1])
         dot_product = vector[0] * 1 + vector[1] * 0
         magnitude = math.sqrt(vector[0] ** 2 + vector[1] ** 2)
         cos_angle = dot_product / magnitude

common/traversal/visitors/direction_visitor.py

@@ -53,10 +53,16 @@ class DirectionVisitor(Visitor):
         # No specific operation for points in this visitor
         return None
 
-    def visit_line(self, line: Vector) -> Dict[str, Any]:
+    def visit_line(self, line: Vector, start_point: Point) -> Dict[str, Any]:
         # Extract direction information
+        start_coords = (start_point.x, start_point.y)
+        end_coords = (
+            (line.x2, line.y2)
+            if line.x1 == start_point.x and line.y1 == start_point.y
+            else (line.x1, line.y1)
+        )
         h_direction, v_direction = self.calculate_direction(
-            line.x1, line.y1, line.x2, line.y2
+            start_coords[0], start_coords[1], end_coords[0], end_coords[1]
         )
         line.horizontal_direction = h_direction
         line.vertical_direction = v_direction

common/traversal/visitors/length_comparison_visitor.py

@@ -2,6 +2,7 @@ from typing import Dict, Any, List
 
 from neo4j import ManagedTransaction
 from .visitor import Visitor
+from ...model.point import Point
 from ...model.vector import Vector
 from ...model.length_comparison_result import LengthComparisonResult
 
@@ -16,7 +17,7 @@ class LengthComparisonVisitor(Visitor):
         # This visitor does not handle points
         return None
 
-    def visit_line(self, line: Vector) -> Dict[str, Any]:
+    def visit_line(self, line: Vector, start_point: Point) -> Dict[str, Any]:
         comparison = LengthComparisonResult.N_A
         if self.previous_length:
             if line.length > self.previous_length:

common/traversal/visitors/quadrant_visitor.py

@@ -13,8 +13,10 @@ class QuadrantVisitor(Visitor):
         self.quadrants: Dict[str, int] = {}
 
     def visit_point(self, point: Point) -> None:
-        # Implementation for point-related operations
-        return None
+        x = point.normalized_x
+        y = point.normalized_y
+        quadrant = self.determine_quadrant(x, y)
+        self.graph.nodes[point.id]["quadrant"] = quadrant
 
     def determine_vector_type(self, dx: float, dy: float) -> str:
         """Determine vector type based on relative dimensions.
@@ -37,9 +39,15 @@ class QuadrantVisitor(Visitor):
         else:
             return "VerticalVector"
 
-    def visit_line(self, line: Vector) -> Dict[str, Any]:
-        dx = line.x2 - line.x1
-        dy = line.y2 - line.y1
+    def visit_line(self, line: Vector, start_point: Point) -> Dict[str, Any]:
+        start_coords = (start_point.x, start_point.y)
+        end_coords = (
+            (line.x2, line.y2)
+            if line.x1 == start_point.x and line.y1 == start_point.y
+            else (line.x1, line.y1)
+        )
+        dx = end_coords[0] - start_coords[0]
+        dy = end_coords[1] - start_coords[1]
         quadrant = self.determine_quadrant(dx, dy)
         vector_type = self.determine_vector_type(dx, dy)
 

common/traversal/visitors/visitor.py

@@ -16,7 +16,7 @@ class Visitor(ABC):
         pass
 
     @abstractmethod
-    def visit_line(self, line: Vector) -> Any:
+    def visit_line(self, line: Vector, start_point: Point) -> Any:
         pass
 
     @abstractmethod

{natural_agi_common-0.1.33.dist-info → natural_agi_common-0.1.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: natural-agi-common
-Version: 0.1.33
+Version: 0.1.35
 Requires-Dist: pydantic
 Requires-Dist: networkx
 Requires-Dist: neo4j

{natural_agi_common-0.1.33.dist-info → natural_agi_common-0.1.35.dist-info}/RECORD

@@ -11,21 +11,21 @@ common/model/dlq.py,sha256=kzHcddbeOkj_YqBghldJOe9CjtO43xxC9Df3Tr5pKD4,111
 common/model/enums.py,sha256=rTJLjJ1AhLkUYRL8ZQvrMuCt46bZ24_tdGMoTgUjF5w,395
 common/model/half_plane.py,sha256=AEeY79Uot-mzwe-DgSKn39K-jCJPstXatxT9zN-IUXw,146
 common/model/length_comparison_result.py,sha256=PEU5QyqpAb9sO0K42cLHILhE_VUMEsNczYhwrFB6UeA,140
-common/model/point.py,sha256=nmvKknrimC5iGa6E5y0rKFYQW80H3XxOPeB_6_8rlUg,551
+common/model/point.py,sha256=GlGTfku0K1Wfs4db7kYe6cHXyx8P9TNx0FoKZqfkspA,703
 common/model/vector.py,sha256=Gnoc-WUU_VCZ-BKO9QLj9a4uzIM81ZW5QZ3yhWpmmSY,651
 common/traversal/__init__.py,sha256=pkj_5-jsIbDoZbj2DyDePsuqICjuAJ2Rzahw-ezWqJk,149
-common/traversal/graph_traversal.py,sha256=BTb522ktmxO92TX9H5yEMdKlaAyS_leI4BZgCFx5a2M,1902
+common/traversal/graph_traversal.py,sha256=F_QBFYPyVckWkxjU-_Jos3WKSSUqaSOg1TbsU27PUPE,2535
 common/traversal/start_point_selector.py,sha256=saW8G3X3bEiXmZ_aTSCtb8hbquzae4qcaicyvsQ_mVw,4608
 common/traversal/visitors/__init__.py,sha256=ROshdBY3CJXJ3tV4xdgGv0OBok8cO4LATqroGah8vjY,639
-common/traversal/visitors/angle_visitor.py,sha256=2p-by7eQ1SQ4mXkqoVMtLxskBodRzJJpsP4WDKySdvU,6394
-common/traversal/visitors/direction_visitor.py,sha256=5WZupy3JOIwrQYMF3-2DujQjq4E1OQifzeGKhC936DM,5673
+common/traversal/visitors/angle_visitor.py,sha256=UX3Hs0xlBBkpGRazH3NasMHy4Xk-LL3kiH8HvGvxF5c,6698
+common/traversal/visitors/direction_visitor.py,sha256=Dn4oPLmhEsL6EpWNC44X2FZU2sIoWMitEiQ5nBty2Po,5944
 common/traversal/visitors/half_plane_visitor.py,sha256=d1DUVtx4gH-dDhicTjN7lR69xvz2SXKQqaP6kzo3orM,2063
-common/traversal/visitors/length_comparison_visitor.py,sha256=gjGzLHtL2IlGgmnggYrcppq293We2DtfU36dNmVZef4,2766
-common/traversal/visitors/quadrant_visitor.py,sha256=DXi8DKAsMnV7QkFaAB57DtSOpJJZ2FkDlFrKWArQAXg,3237
+common/traversal/visitors/length_comparison_visitor.py,sha256=hW56siLZodjsNWEFcyg9k0fclJLzT2ArneZCZZLVx9Y,2819
+common/traversal/visitors/quadrant_visitor.py,sha256=N8Vb91FqtRYoQ2G9cK91KAfDaC7u2KbPeQ3sDNqgvcw,3603
 common/traversal/visitors/relative_position_visitor.py,sha256=3VfJWiuyvC9kc4C9F65LCJ7V4ecmbdz68KMahN2cOxc,7058
-common/traversal/visitors/visitor.py,sha256=n2e0mkvD76fqGaegsR48GEBzkbYIY0ZPs9J89ywzqLM,755
+common/traversal/visitors/visitor.py,sha256=30J0GEqzgeQrOng-rjPncXlcLE16WE7sqLlJ7-8SuwU,775
 common/traversal/visitors/visitor_result_persistence_service.py,sha256=lpr6KzZt22tjTpBnepbTMZ2gi9eLLNrojEv9ABTbvhE,760
-natural_agi_common-0.1.33.dist-info/METADATA,sha256=HcW9HJBrCREplquv647JUwHIvVhOCuuQNzScXFGx_Yw,133
-natural_agi_common-0.1.33.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-natural_agi_common-0.1.33.dist-info/top_level.txt,sha256=LOtYx8KZTmnxM_zLK4rwrcI3PRc40Ihwp5rgaQ-ceaI,7
-natural_agi_common-0.1.33.dist-info/RECORD,,
+natural_agi_common-0.1.35.dist-info/METADATA,sha256=xQD5uBCX4sqV5FmFJEMFBccebMWIuu3xYNbE47gPQbY,133
+natural_agi_common-0.1.35.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+natural_agi_common-0.1.35.dist-info/top_level.txt,sha256=LOtYx8KZTmnxM_zLK4rwrcI3PRc40Ihwp5rgaQ-ceaI,7
+natural_agi_common-0.1.35.dist-info/RECORD,,