More cleanup of C++ examples, cleanup some leftover utcnow

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>

Author: timkpaine

README.md

@@ -23,7 +23,7 @@ Here is a very simple example of a small `csp` program to calculate a [bid-ask s
 ```python
 import csp
 from csp import ts
-from datetime import datetime
+from csp.utils.datetime import utc_now
 
 
 @csp.node
@@ -44,7 +44,7 @@ def my_graph():
 
 
 if __name__ == '__main__':
-    csp.run(my_graph, starttime=datetime.utcnow())
+    csp.run(my_graph, starttime=utc_now())
 ```
 
 Running this, our output should look like (with some slight variations for current time):

cpp/csp/core/Platform.h

@@ -17,30 +17,30 @@
 #define DLL_LOCAL
 
 #ifdef CSPTYPESIMPL_EXPORTS
-#define CSPTYPESIMPL_EXPORT __declspec(dllexport)
+#define CSPTYPESIMPL_EXPORT __declspec( dllexport )
 #else
-#define CSPTYPESIMPL_EXPORT __declspec(dllimport)
+#define CSPTYPESIMPL_EXPORT __declspec( dllimport )
 #endif
 
 #ifdef CSPIMPL_EXPORTS
-#define CSPIMPL_EXPORT __declspec(dllexport)
+#define CSPIMPL_EXPORT __declspec( dllexport )
 #else
-#define CSPIMPL_EXPORT __declspec(dllimport)
+#define CSPIMPL_EXPORT __declspec( dllimport )
 #endif
 
 // C API export macro - used for ABI-stable C functions
 // On Windows: export from cspimpl.dll
 // On Unix: ensure symbols have default visibility
 #ifdef CSPIMPL_EXPORTS
-#define CSP_C_API_EXPORT __declspec(dllexport)
+#define CSP_C_API_EXPORT __declspec( dllexport )
 #else
-#define CSP_C_API_EXPORT __declspec(dllimport)
+#define CSP_C_API_EXPORT __declspec( dllimport )
 #endif
 
-#define START_PACKED __pragma( pack(push, 1) )
-#define END_PACKED   __pragma( pack(pop))
+#define START_PACKED __pragma( pack( push, 1 ) )
+#define END_PACKED   __pragma( pack( pop ) )
 
-#define NO_INLINE    __declspec(noinline)
+#define NO_INLINE    __declspec( noinline )
 
 inline tm * localtime_r( const time_t * timep, tm * result )
 {
@@ -103,14 +103,14 @@ inline uint8_t ffs(uint64_t n)
 #define CSPTYPESIMPL_EXPORT
 
 // C API export macro - ensure symbols have default visibility for external use
-#define CSP_C_API_EXPORT __attribute__((visibility("default")))
+#define CSP_C_API_EXPORT __attribute__( ( visibility( "default" ) ) )
 
-#define DLL_LOCAL __attribute__ ((visibility ("hidden")))
+#define DLL_LOCAL __attribute__ ( ( visibility( "hidden" ) ) )
 
 #define START_PACKED
-#define END_PACKED __attribute__((packed))
+#define END_PACKED __attribute__( ( packed ) )
 
-#define NO_INLINE  __attribute__ ((noinline))
+#define NO_INLINE  __attribute__ ( ( noinline ) )
 
 inline constexpr uint8_t clz(uint32_t n) { return __builtin_clz(n); }
 inline constexpr uint8_t clz(uint64_t n) { return __builtin_clzl(n); }

docs/wiki/get-started/More-with-CSP.md

@@ -15,6 +15,7 @@ We also turn off memoization for the node by passing `memoize=False`. This means
 ```python
 import csp
 from csp import ts
+
 from datetime import timedelta
 import numpy as np
 
@@ -38,9 +39,10 @@ def poisson_counter(rate: float) -> ts[int]:
 We can run the node using `csp.run` as follows:
 
 ```python
-from datetime import datetime
+from datetime import timedelta
+from csp.utils.datetime import utc_now
 
-res = csp.run(poisson_counter, rate=2.0, starttime=datetime.utcnow(), endtime=timedelta(seconds=10), realtime=False)
+res = csp.run(poisson_counter, rate=2.0, starttime=utc_now(), endtime=timedelta(seconds=10), realtime=False)
 print(f'Final count: {res[0][-1][1]}')
 ```
 

docs/wiki/how-tos/Write-C-API-Adapters.md

@@ -769,8 +769,11 @@ _managed_output_def = output_adapter_def(
 #### Use Managed Adapters in Your Graph
 
 ```python
+from datetime import timedelta
+
 import csp
-from datetime import datetime, timedelta
+from csp.utils.datetime import utc_now
+
 from my_adapter import MyAdapterManager
 
 @csp.graph
@@ -782,22 +785,25 @@ def my_graph():
     data = mgr.subscribe(int, interval_ms=100)
     mgr.publish(data)
 
-csp.run(my_graph, starttime=datetime.utcnow(), endtime=timedelta(seconds=10))
+csp.run(my_graph, starttime=utc_now(), endtime=timedelta(seconds=10))
 ```
 
 #### Use in Your Graph
 
 ```python
+from datetime import timedelta
+
 import csp
-from datetime import datetime, timedelta
+from csp.utils.datetime import utc_now
+
 from my_adapter import my_input, LogAdapter
 
 @csp.graph
 def my_graph():
     data = my_input(int, interval_ms=100)
     LogAdapter(data, prefix="[MyApp] ")
 
-csp.run(my_graph, starttime=datetime.utcnow(), endtime=timedelta(seconds=10))
+csp.run(my_graph, starttime=utc_now(), endtime=timedelta(seconds=10))
 ```
 
 ## See Also

examples/05_cpp/3_cpp_adapter/README.md

@@ -102,7 +102,9 @@ After building, you can use the adapter in Python:
 
 ```python
 import csp
-from datetime import datetime, timedelta
+from csp.utils.datetime import utc_now
+
+from datetime import timedelta
 
 from counteradapter import CounterAdapterManager
 
@@ -121,8 +123,7 @@ def my_graph():
     mgr.publish(data)
 
 # Run for 2 seconds in realtime mode
-csp.run(my_graph, starttime=datetime.utcnow(),
-        endtime=datetime.utcnow() + timedelta(seconds=2), realtime=True)
+csp.run(my_graph, starttime=utc_now(), endtime=timedelta(seconds=2), realtime=True)
 ```
 
 Or run the example directly:

examples/05_cpp/3_cpp_adapter/counteradapter/__main__.py

@@ -15,34 +15,12 @@
     PYTHONPATH=build:$PYTHONPATH python example.py
 """
 
-import sys
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 import csp
+from counteradapter import CounterAdapterManager
 from csp import ts
-
-
-# For development/testing, add the build directory to path
-# In production, you would install the module properly
-def setup_path():
-    """Add the build directory to the Python path if needed."""
-    import os
-
-    build_dir = os.path.join(os.path.dirname(__file__), "build")
-    if os.path.exists(build_dir) and build_dir not in sys.path:
-        sys.path.insert(0, build_dir)
-
-
-setup_path()
-
-# Import the adapter after setting up the path
-try:
-    from counteradapter import CounterAdapterManager
-except ImportError:
-    print("Error: Could not import counteradapter.")
-    print("Make sure you have built the C++ extension module.")
-    print("See the build instructions in README.md")
-    sys.exit(1)
+from csp.utils.datetime import utc_now
 
 
 @csp.node
@@ -84,7 +62,7 @@ def main():
     print("=" * 40)
 
     # Run the graph for 2 seconds
-    start = datetime.utcnow()
+    start = utc_now()
     end = start + timedelta(seconds=2)
 
     result = csp.run(counter_graph, starttime=start, endtime=end, realtime=True)

examples/05_cpp/3_cpp_adapter/counteradapter/test_counteradapter.py

@@ -1,12 +1,13 @@
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 import csp
+from csp.utils.datetime import utc_now
 
 from .__main__ import counter_graph
 
 
 def test_counteradapter():
-    start = datetime.utcnow()
+    start = utc_now()
     end = start + timedelta(seconds=2)
 
     result = csp.run(counter_graph, starttime=start, endtime=end, realtime=True)

examples/05_cpp/4_c_api_adapter/README.md

@@ -148,7 +148,11 @@ my_output_adapter = output_adapter_def(
 ## Usage from Python
 
 ```python
+from datetime import timedelta
+
 import csp
+from csp.utils.datetime import utc_now
+
 from exampleadapter import example_input, example_output
 
 @csp.graph
@@ -159,7 +163,7 @@ def my_graph():
     # Output to stdout with a prefix
     example_output(data, prefix="[MyApp] ")
 
-csp.run(my_graph, starttime=datetime.utcnow(), endtime=timedelta(seconds=5))
+csp.run(my_graph, starttime=utc_now(), endtime=timedelta(seconds=5))
 ```
 
 ## API Headers

examples/07_end_to_end/earthquake.ipynb

@@ -279,6 +279,7 @@
     "import csp\n",
     "from csp.impl.pushpulladapter import PushPullInputAdapter\n",
     "from csp.impl.wiring import py_pushpull_adapter_def\n",
+    "from csp.utils.datetime import utc_now\n",
     "\n",
     "\n",
     "# We use a csp.Struct to store the earthquake event data\n",
@@ -328,7 +329,7 @@
     "            self.push_tick(False, event_data.time, event_data)\n",
     "\n",
     "        print(\"-------------------------------------------------------------------\")\n",
-    "        print(f\"{datetime.utcnow()}: Historical replay complete, pulled {len(catalog)} events\")\n",
+    "        print(f\"{utc_now()}: Historical replay complete, pulled {len(catalog)} events\")\n",
     "        print(\"-------------------------------------------------------------------\")\n",
     "        self.flag_replay_complete()\n",
     "\n",
@@ -349,7 +350,7 @@
     "                    break\n",
     "\n",
     "            print(\"-------------------------------------------------------------------\")\n",
-    "            print(f\"{datetime.utcnow()}: Refreshing earthquake live feed with {len(new_events)} events\")\n",
+    "            print(f\"{utc_now()}: Refreshing earthquake live feed with {len(new_events)} events\")\n",
     "            print(\"-------------------------------------------------------------------\")\n",
     "\n",
     "            for event in reversed(new_events):\n",
@@ -400,8 +401,8 @@
     "    print(\"End of graph building\")\n",
     "\n",
     "\n",
-    "start = datetime.utcnow() - timedelta(hours=24)\n",
-    "end = datetime.utcnow() + timedelta(minutes=10)\n",
+    "start = utc_now() - timedelta(hours=24)\n",
+    "end = utc_now() + timedelta(minutes=10)\n",
     "csp.run(earthquake_graph, starttime=start, endtime=end, realtime=True)\n",
     "print(\"Done.\")"
    ]

examples/07_end_to_end/mta.ipynb

@@ -395,7 +395,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": null,
    "id": "f808ff5b-2735-4b58-bd29-054dabdc6620",
    "metadata": {},
    "outputs": [
@@ -656,6 +656,7 @@
     "import csp\n",
     "from csp.impl.pushadapter import PushInputAdapter\n",
     "from csp.impl.wiring import py_push_adapter_def\n",
+    "from csp.utils.datetime import utc_now\n",
     "\n",
     "\n",
     "class Event(csp.Struct):\n",
@@ -691,7 +692,7 @@
     "\n",
     "        while self._running:\n",
     "            print(\"----------------------------------------------\")\n",
-    "            print(f\"{datetime.utcnow()}: refreshing MTA feed\")\n",
+    "            print(f\"{utc_now()}: refreshing MTA feed\")\n",
     "            print(\"----------------------------------------------\")\n",
     "            print(\"                                     Station     | Line | Direction   | Arrival time\")\n",
     "            feed.refresh()\n",
@@ -738,7 +739,7 @@
     "    print(\"End of graph building\")\n",
     "\n",
     "\n",
-    "start = datetime.utcnow()\n",
+    "start = utc_now()\n",
     "end = start + timedelta(minutes=3)\n",
     "csp.run(mta_graph, starttime=start, realtime=True, endtime=end)\n",
     "print(\"Done.\")"