amps-python-client 5.3.4.2__zip → 5.3.4.4__zip

amps-python-client-5.3.4.4/src/hybridpublishstore.cpp

@@ -0,0 +1,275 @@
+////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2010-2024 60East Technologies Inc., All Rights Reserved.
+//
+// This computer software is owned by 60East Technologies Inc. and is
+// protected by U.S. copyright laws and other laws and by international
+// treaties.  This computer software is furnished by 60East Technologies
+// Inc. pursuant to a written license agreement and may be used, copied,
+// transmitted, and stored only in accordance with the terms of such
+// license agreement and with the inclusion of the above copyright notice.
+// This computer software or any other copies thereof may not be provided
+// or otherwise made available to any other person.
+//
+// U.S. Government Restricted Rights.  This computer software: (a) was
+// developed at private expense and is in all respects the proprietary
+// information of 60East Technologies Inc.; (b) was not developed with
+// government funds; (c) is a trade secret of 60East Technologies Inc.
+// for all purposes of the Freedom of Information Act; and (d) is a
+// commercial item and thus, pursuant to Section 12.212 of the Federal
+// Acquisition Regulations (FAR) and DFAR Supplement Section 227.7202,
+// Government's use, duplication or disclosure of the computer software
+// is subject to the restrictions set forth by 60East Technologies Inc..
+//
+////////////////////////////////////////////////////////////////////////////
+
+#define PY_SSIZE_T_CLEAN 1
+#include <Python.h>
+#include <amps/ampsplusplus.hpp>
+#include <ampspy_types.hpp>
+#include <ampspy_defs.hpp>
+#include <amps/HybridPublishStore.hpp>
+#include "hybridpublishstore_docs.h"
+
+using namespace AMPS;
+namespace ampspy
+{
+  namespace hybridpublishstore
+  {
+
+    AMPSDLL ampspy::ampspy_type_object hybridpublishstore_type;
+
+//    def __init__(self, name):
+    static void* __ctor(obj* self, PyObject* args, PyObject* kwds)
+    {
+      char* filename = NULL;
+      unsigned long maxMemoryCapacity = 0;
+      PyObject* value = NULL;
+      if (!PyArg_ParseTuple(args, "sk|O!", &filename, &maxMemoryCapacity, &PyBool_Type, &value))
+      {
+        return NULL;
+      }
+      assert(filename != NULL);
+      bool errorOnPublishGap = value && value == Py_True;
+
+      std::string fileName(filename);
+      try
+      {
+        UNLOCKGIL;
+        self->impl = new Store(new HybridPublishStore(fileName, (size_t)maxMemoryCapacity, errorOnPublishGap));
+      } DISPATCH_EXCEPTION;
+      self->resizeHandler = NULL;
+      return (void*)self;
+    }
+
+    static int _ctor(obj* self, PyObject* args, PyObject* kwds)
+    {
+      if (__ctor(self, args, kwds) == NULL)
+      {
+        return -1;
+      }
+      return 0;
+    }
+
+    static void _dtor(obj* self)
+    {
+      {
+        UNLOCKGIL;
+        delete self->impl;
+      }
+      self->impl = 0;
+      Py_XDECREF(self->resizeHandler);
+      shims::free(self);
+    }
+
+    static PyObject* store(obj* self, PyObject* args)
+    {
+      Store* pStore = self->impl;
+      PyObject* pPyMessage = NULL;
+      if (!PyArg_ParseTuple(args, "O", &pPyMessage))
+      {
+        return NULL;
+      }
+      Message* pMessage = ((ampspy::message::obj*)pPyMessage)->pMessage;
+      CALL_RETURN_UINT64_T(pStore->store(*pMessage));
+    }
+
+    static PyObject* discard_up_to(obj* self, PyObject* args)
+    {
+      Store* pStore = self->impl;
+      unsigned long long seq = 0ULL;
+      if (!PyArg_ParseTuple(args, "K", &seq))
+      {
+        return NULL;
+      }
+      CALL_RETURN_NONE(pStore->discardUpTo(seq));
+    }
+
+    class PyClientStoreReplayer : public AMPS::StoreReplayer
+    {
+      PyObject* _pPyHandler;
+      ampspy::message::obj* _pMessage;
+      PyObject* _pMessageArgs;
+    public:
+      PyClientStoreReplayer(PyObject* pPyHandler)
+      : _pPyHandler(pPyHandler)
+      {
+        Py_INCREF(_pPyHandler);
+        _pMessage = (ampspy::message::obj*)_PyObject_New(
+                          ampspy::message::message_type);
+        _pMessage->isOwned = false;
+        assert(_pMessage);
+        _pMessageArgs = Py_BuildValue("(O)", _pMessage);
+        assert(_pMessageArgs);
+      }
+
+      virtual void execute(Message& message_)
+      {
+        LOCKGIL;
+        _pMessage->pMessage = (Message*)&message_;
+        PyObject* result = PyObject_Call(_pPyHandler, _pMessageArgs,
+                                         (PyObject*)NULL);
+        if (result == NULL)
+        {
+          if (PyErr_ExceptionMatches(PyExc_SystemExit))
+          {
+            ampspy::unhandled_exception();
+          }
+          else
+          {
+            // translate amps py exception into amps cpp, throw
+            exc::throwError();
+          }
+        }
+        else
+        {
+          Py_DECREF(result);
+        }
+      }
+
+      virtual ~PyClientStoreReplayer()
+      {
+        Py_CLEAR(_pPyHandler);
+        Py_CLEAR(_pMessage);
+        Py_CLEAR(_pMessageArgs);
+      }
+    };
+
+    static PyObject* replay(obj* self, PyObject* args)
+    {
+      Store* pStore = self->impl;
+      PyObject* pOnMessage = NULL;
+      if (!PyArg_ParseTuple(args, "O", &pOnMessage))
+      {
+        return NULL;
+      }
+      PyClientStoreReplayer replayer(pOnMessage);
+      CALL_RETURN_NONE(pStore->replay(replayer));
+    }
+
+    static PyObject* replay_single(obj* self, PyObject* args)
+    {
+      Store* pStore = self->impl;
+      PyObject* pOnMessage = NULL;
+      unsigned long long seq = 0;
+      if (!PyArg_ParseTuple(args, "OK", &pOnMessage, &seq))
+      {
+        return NULL;
+      }
+      PyClientStoreReplayer replayer(pOnMessage);
+      CALL_RETURN_NONE(pStore->replaySingle(replayer, seq));
+    }
+
+    static PyObject* get_unpersisted_count(obj* self, PyObject* args)
+    {
+      CALL_RETURN_SIZE_T(self->impl->unpersistedCount());
+    }
+
+    static PyObject* get_lowest_unpersisted(obj* self, PyObject* args)
+    {
+      Store* pStore = self->impl;
+      CALL_RETURN_UINT64_T(pStore->getLowestUnpersisted());
+    }
+
+    static PyObject* get_last_persisted(obj* self, PyObject* args)
+    {
+      Store* pStore = self->impl;
+      CALL_RETURN_UINT64_T(pStore->getLastPersisted());
+    }
+
+    bool
+    call_resize_handler(StoreImpl* store, size_t size, void* vp)
+    {
+      LOCKGIL;
+      obj* s = (obj*)vp;
+#if defined(_WIN32) && !defined(_WIN64)
+      PyObject* args = Py_BuildValue("(Oi)", s, size);
+#else
+      PyObject* args = Py_BuildValue("(Ol)", s, size);
+#endif
+      PyObject* pyRet = PyObject_Call(s->resizeHandler, args, (PyObject*)NULL);
+      Py_DECREF(args);
+      if (pyRet == NULL || PyErr_Occurred())
+      {
+        Py_XDECREF(pyRet);
+        if (PyErr_ExceptionMatches(PyExc_SystemExit))
+        {
+          ampspy::unhandled_exception();
+        }
+        throw StoreException("The resize handler threw an exception");
+      }
+      bool ret = (PyObject_IsTrue(pyRet) != 0);
+      Py_DECREF(pyRet);
+      return ret;
+    }
+
+    static PyObject* set_resize_handler(obj* self, PyObject* args)
+    {
+      PyObject* callable;
+      if (!PyArg_ParseTuple(args, "O", &callable))
+      {
+        return NULL;
+      }
+      if (!PyCallable_Check(callable))
+      {
+        PyErr_SetString(PyExc_TypeError, "argument must be callable.");
+        return NULL;
+      }
+      Py_INCREF(callable);
+      if (self->resizeHandler)
+      {
+        Py_DECREF(self->resizeHandler);
+      }
+      self->resizeHandler = callable;
+      CALL_RETURN_NONE(self->impl->setResizeHandler((AMPS::PublishStoreResizeHandler)call_resize_handler, self));
+    }
+
+    void add_types(PyObject* module_)
+    {
+      hybridpublishstore_type.setName("AMPS.HybridPublishStore")
+      .setBasicSize(sizeof(obj))
+      .setDestructorFunction(_dtor)
+      .setConstructorFunction(_ctor)
+      .setDoc(hybridpublishstore_class_doc)
+      .setBaseType()
+      .notCopyable()
+      .addMethod("store", store, "store()\n\nStore the provided message into the publish store. Returns the sequence number that should be assigned to the message.\n\n"
+                                                  ":param message: The message to put into the store.\n")
+      .addMethod("discard_up_to", discard_up_to, "discard_up_to()\n\nDiscard all messages in the publish store with a sequence number less than or equal to the provided argument.\n\n"
+                                                  ":param sequence: The highest sequence number to discard.\n")
+      .addMethod("replay", replay, "replay()\n\nReplays all messages currently in the publish store via the provided message handler.\n"
+                                                  ":param handler: The message handler to call with each message.\n")
+      .addMethod("replay_single", replay_single, "replay_single()\n\nReplays the message with the given sequence number if it is currently in the publish store via the provided message handler.\n"
+                                                  ":param handler: The message handler to call with each message.\n"
+                                                  ":param sequence: The sequence number of the message to replay.\n")
+      .addMethod("get_unpersisted_count", get_unpersisted_count, "get_unpersisted_count()\n\nReturns the number of messages published which have not been ACK'ed by the server.\n")
+      .addMethod("get_lowest_unpersisted", get_lowest_unpersisted, "get_lowest_unpersisted()\n\nReturns the sequence number of the oldest message in the publish store.\n")
+      .addMethod("get_last_persisted", get_last_persisted, "get_last_persisted()\n\nReturns the sequence number of last message ACK'ed by the server.\n")
+      .addMethod("set_resize_handler", set_resize_handler, "set_resize_handler()\n\nSets the object to call when the store needs to resize.\n")
+      .createType()
+      .registerType("HybridPublishStore", module_);
+
+    }
+
+  } // namespace hybridpublishstore
+} // namespace ampspy

{amps-python-client-5.3.4.2 → amps-python-client-5.3.4.4}/src/memorypublishstore.cpp

@@ -36,20 +36,34 @@ namespace ampspy
   namespace memorypublishstore
   {
 //    def __init__(self, name):
-    static int _ctor(obj* self, PyObject* args, PyObject* kwds)
+    static void* __ctor(obj* self, PyObject* args, PyObject* kwds)
     {
       int numBlocks = -1;
       PyObject* value = NULL;
       if (!PyArg_ParseTuple(args, "|IO!", &numBlocks, &PyBool_Type, &value))
       {
-        return -1;
+        return NULL;
       }
       if (numBlocks <=0 )
       {
         numBlocks = 10000;
       }
       bool errorOnPublishGap = value && value == Py_True;
-      self->impl = new Store(new MemoryPublishStore(numBlocks, errorOnPublishGap));
+      try
+      {
+        UNLOCKGIL;
+        self->impl = new Store(new MemoryPublishStore(numBlocks, errorOnPublishGap));
+      } DISPATCH_EXCEPTION;
+      self->resizeHandler = NULL;
+      return (void*)self;
+    }
+
+    static int _ctor(obj* self, PyObject* args, PyObject* kwds)
+    {
+      if (__ctor(self, args, kwds) == NULL)
+      {
+        return -1;
+      }
       return 0;
     }
 
@@ -59,13 +73,125 @@ namespace ampspy
         UNLOCKGIL;
         delete self->impl;
       }
+      self->impl = 0;
       Py_XDECREF(self->resizeHandler);
       shims::free(self);
     }
 
+    static PyObject* store(obj* self, PyObject* args)
+    {
+      Store* pStore = self->impl;
+      PyObject* pPyMessage = NULL;
+      if (!PyArg_ParseTuple(args, "O", &pPyMessage))
+      {
+        return NULL;
+      }
+      Message* pMessage = ((ampspy::message::obj*)pPyMessage)->pMessage;
+      CALL_RETURN_UINT64_T(pStore->store(*pMessage));
+    }
+
+    static PyObject* discard_up_to(obj* self, PyObject* args)
+    {
+      Store* pStore = self->impl;
+      unsigned long long seq = 0ULL;
+      if (!PyArg_ParseTuple(args, "K", &seq))
+      {
+        return NULL;
+      }
+      CALL_RETURN_NONE(pStore->discardUpTo(seq));
+    }
+
+    class PyClientStoreReplayer : public AMPS::StoreReplayer
+    {
+      PyObject* _pPyHandler;
+      ampspy::message::obj* _pMessage;
+      PyObject* _pMessageArgs;
+    public:
+      PyClientStoreReplayer(PyObject* pPyHandler)
+      : _pPyHandler(pPyHandler)
+      {
+        Py_INCREF(_pPyHandler);
+        _pMessage = (ampspy::message::obj*)_PyObject_New(
+                          ampspy::message::message_type);
+        _pMessage->isOwned = false;
+        assert(_pMessage);
+        _pMessageArgs = Py_BuildValue("(O)", _pMessage);
+        assert(_pMessageArgs);
+      }
+
+      virtual void execute(Message& message_)
+      {
+        LOCKGIL;
+        _pMessage->pMessage = (Message*)&message_;
+        PyObject* result = PyObject_Call(_pPyHandler, _pMessageArgs,
+                                         (PyObject*)NULL);
+        if (result == NULL)
+        {
+          if (PyErr_ExceptionMatches(PyExc_SystemExit))
+          {
+            ampspy::unhandled_exception();
+          }
+          else
+          {
+            // translate amps py exception into amps cpp, throw
+            exc::throwError();
+          }
+        }
+        else
+        {
+          Py_DECREF(result);
+        }
+      }
+
+      virtual ~PyClientStoreReplayer()
+      {
+        Py_CLEAR(_pPyHandler);
+        Py_CLEAR(_pMessage);
+        Py_CLEAR(_pMessageArgs);
+      }
+    };
+
+    static PyObject* replay(obj* self, PyObject* args)
+    {
+      Store* pStore = self->impl;
+      PyObject* pOnMessage = NULL;
+      if (!PyArg_ParseTuple(args, "O", &pOnMessage))
+      {
+        return NULL;
+      }
+      PyClientStoreReplayer replayer(pOnMessage);
+      CALL_RETURN_NONE(pStore->replay(replayer));
+    }
+
+    static PyObject* replay_single(obj* self, PyObject* args)
+    {
+      Store* pStore = self->impl;
+      PyObject* pOnMessage = NULL;
+      unsigned long long seq = 0;
+      if (!PyArg_ParseTuple(args, "OK", &pOnMessage, &seq))
+      {
+        return NULL;
+      }
+      PyClientStoreReplayer replayer(pOnMessage);
+      CALL_RETURN_NONE(pStore->replaySingle(replayer, seq));
+    }
+
     static PyObject* get_unpersisted_count(obj* self, PyObject* args)
     {
-      return PyInt_FromSize_t( self->impl->unpersistedCount() );
+      Store* pStore = self->impl;
+      CALL_RETURN_SIZE_T(pStore->unpersistedCount());
+    }
+
+    static PyObject* get_lowest_unpersisted(obj* self, PyObject* args)
+    {
+      Store* pStore = self->impl;
+      CALL_RETURN_UINT64_T(pStore->getLowestUnpersisted());
+    }
+
+    static PyObject* get_last_persisted(obj* self, PyObject* args)
+    {
+      Store* pStore = self->impl;
+      CALL_RETURN_UINT64_T(pStore->getLastPersisted());
     }
 
     bool
@@ -141,7 +267,18 @@ namespace ampspy
       .setDoc(memorypublishstore_class_doc)
       .setBaseType()
       .notCopyable()
+      .addMethod("store", store, "store()\n\nStore the provided message into the publish store. Returns the sequence number that should be assigned to the message.\n\n"
+                                                  ":param message: The message to put into the store.\n")
+      .addMethod("discard_up_to", discard_up_to, "discard_up_to()\n\nDiscard all messages in the publish store with a sequence number less than or equal to the provided argument.\n\n"
+                                                  ":param sequence: The highest sequence number to discard.\n")
+      .addMethod("replay", replay, "replay()\n\nReplays all messages currently in the publish store via the provided message handler.\n"
+                                                  ":param handler: The message handler to call with each message.\n")
+      .addMethod("replay_single", replay_single, "replay_single()\n\nReplays the message with the given sequence number if it is currently in the publish store via the provided message handler.\n"
+                                                  ":param handler: The message handler to call with each message.\n"
+                                                  ":param sequence: The sequence number of the message to replay.\n")
       .addMethod("get_unpersisted_count", get_unpersisted_count, "get_unpersisted_count()\n\nReturns the number of messages published which have not been ACK'ed by the server.\n")
+      .addMethod("get_lowest_unpersisted", get_lowest_unpersisted, "get_lowest_unpersisted()\n\nReturns the sequence number of the oldest message in the publish store.\n")
+      .addMethod("get_last_persisted", get_last_persisted, "get_last_persisted()\n\nReturns the sequence number of last message ACK'ed by the server.\n")
       .addMethod("set_resize_handler", set_resize_handler, "set_resize_handler()\n\nSets the object to call when the store needs to resize.\n")
       .addMethod("get_error_on_publish_gap", get_error_on_publish_gap, "get_error_on_publish_gap()\n\nReturns If true, PublishStoreGapException can be thrown\n"
                                                   "           by the client publish store if the client logs onto a server that\n"

{amps-python-client-5.3.4.2 → amps-python-client-5.3.4.4}/src/messagestream.cpp

@@ -96,6 +96,14 @@ namespace ampspy
           AMPS_FETCH_AND_8((&_flags), ~ms_is_active);
           AMPS_FETCH_OR_8((&_flags), ms_is_disconnected_in_progress);
         }
+        else if (newState_ == AMPS::ConnectionStateListener::Connected
+                 && _commandId.empty()
+                 && _subId.empty()
+                 && _queryId.empty())
+        {
+          AMPS_FETCH_OR_8((&_flags), ms_is_active);
+          AMPS_FETCH_AND_8((&_flags), ~ms_is_disconnected_in_progress);
+        }
       }
 
       void unsubscribe(const std::string& id_, bool active_ = false)

{amps-python-client-5.3.4.2 → amps-python-client-5.3.4.4}/src/nvfixbuilder.cpp

@@ -140,11 +140,11 @@ namespace ampspy
       .setDoc(nvfixbuilder_class_doc)
       .notCopyable()
       .addMethod("append", append,
-                 "append(tag,value,(optional)offset,(optional)length)\n\nAppends tag=value to self.\n\n"
+                 "append(tag,value,offset(optional),length(optional))\n\nAppends ``tag=value`` to self.\n\n"
                  ":param tag: The tag to use.\n:type tag: str\n"
                  ":param value: The value for the given tag.\n:type value: str\n"
-                 ":param offset: Optional. The offset into value at which the value actually starts.\n:type offset: int\n"
-                 ":param length: Optional. The length of the actual value within value. Only valid and required if offset is also provided.\n:type tag: int\n")
+                 ":param offset: The offset into value at which the value actually starts. *Optional.*\n:type offset: int\n"
+                 ":param length: The length of the actual value within value. *Optional.* Only valid and required if offset is also provided.\n:type length: int\n")
       .addMethod("get_string", get_string,
                  "get_string()\n\n"
                  "Called to get the string NVFIX message.\n\n"

{amps-python-client-5.3.4.2 → amps-python-client-5.3.4.4}/src/nvfixbuilder_docs.h

@@ -23,12 +23,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
-static const char* nvfixbuilder_class_doc = R"docstring(
+static const char* nvfixbuilder_class_doc = R"docstring(NVFIXBuilder(delimiter)
 Convenience class for easily creating NVFIX strings.
 
-Constructor arguments:
+**Constructor Arguments:**
 
-:param delimiter: The delimiter to use between NVFIX fields. Defaults to \\\\x01 if no delimiter is provided.
+:param delimiter: The delimiter to use between NVFIX fields. Defaults to \\x01 if no delimiter is provided.
 )docstring";
 
 

{amps-python-client-5.3.4.2 → amps-python-client-5.3.4.4}/src/nvfixshredder_docs.h

@@ -23,12 +23,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
-static const char* nvfixshredder_class_doc = R"docstring(
+static const char* nvfixshredder_class_doc = R"docstring(NVFIXShredder(delimiter)
 Convenience class for easily processing NVFIX strings.
 
-Constructor arguments:
+**Constructor Arguments:**
 
-:param separator: The delimiter to expect between NVFIX fields. Defaults to \\\\x01 if no delimiter is provided.
+:param delimiter: The delimiter to expect between NVFIX fields. Defaults to \\x01 if no delimiter is provided.
 )docstring";
 
 

{amps-python-client-5.3.4.2 → amps-python-client-5.3.4.4}/src/publishstore.cpp

@@ -45,12 +45,16 @@ namespace ampspy
         return NULL;
       }
       bool errorOnPublishGap = value && value == Py_True;
+
+      std::string fileName(filename);
       self->impl = 0;
       try
       {
-        self->impl = new PublishStore(filename, errorOnPublishGap);
+        UNLOCKGIL;
+        self->impl = new PublishStore(fileName, errorOnPublishGap);
         self->impl->addRef();
       } DISPATCH_EXCEPTION;
+      self->resizeHandler = NULL;
       return (void*)filename;
     }
 
@@ -67,6 +71,7 @@ namespace ampspy
     {
       if (self->impl)
       {
+        UNLOCKGIL;
         self->impl->removeRef();
       }
       self->impl = 0;
@@ -74,9 +79,119 @@ namespace ampspy
       shims::free(self);
     }
 
+    static PyObject* store(obj* self, PyObject* args)
+    {
+      PublishStore* pStore = self->impl;
+      PyObject* pPyMessage = NULL;
+      if (!PyArg_ParseTuple(args, "O", &pPyMessage))
+      {
+        return NULL;
+      }
+      Message* pMessage = ((ampspy::message::obj*)pPyMessage)->pMessage;
+      CALL_RETURN_UINT64_T(pStore->store(*pMessage));
+    }
+
+    static PyObject* discard_up_to(obj* self, PyObject* args)
+    {
+      PublishStore* pStore = self->impl;
+      unsigned long long seq = 0ULL;
+      if (!PyArg_ParseTuple(args, "K", &seq))
+      {
+        return NULL;
+      }
+      CALL_RETURN_NONE(pStore->discardUpTo((amps_uint64_t)seq));
+    }
+
+    class PyClientStoreReplayer : public StoreReplayer
+    {
+      PyObject* _pPyHandler;
+      ampspy::message::obj* _pMessage;
+      PyObject* _pMessageArgs;
+    public:
+      PyClientStoreReplayer(PyObject* pPyHandler)
+      : _pPyHandler(pPyHandler)
+      {
+        Py_INCREF(_pPyHandler);
+        _pMessage = (ampspy::message::obj*)_PyObject_New(
+                          ampspy::message::message_type);
+        _pMessage->isOwned = false;
+        assert(_pMessage);
+        _pMessageArgs = Py_BuildValue("(O)", _pMessage);
+        assert(_pMessageArgs);
+      }
+
+      virtual void execute(Message& message_)
+      {
+        LOCKGIL;
+        _pMessage->pMessage = (Message*)&message_;
+        PyObject* result = PyObject_Call(_pPyHandler, _pMessageArgs,
+                                         (PyObject*)NULL);
+        if (result == NULL)
+        {
+          if (PyErr_ExceptionMatches(PyExc_SystemExit))
+          {
+            ampspy::unhandled_exception();
+          }
+          else
+          {
+            // translate amps py exception into amps cpp, throw
+            exc::throwError();
+          }
+        }
+        else
+        {
+          Py_DECREF(result);
+        }
+      }
+
+      virtual ~PyClientStoreReplayer()
+      {
+        Py_CLEAR(_pPyHandler);
+        Py_CLEAR(_pMessage);
+        Py_CLEAR(_pMessageArgs);
+      }
+    };
+
+    static PyObject* replay(obj* self, PyObject* args)
+    {
+      PublishStore* pStore = self->impl;
+      PyObject* pOnMessage = NULL;
+      if (!PyArg_ParseTuple(args, "O", &pOnMessage))
+      {
+        return NULL;
+      }
+      PyClientStoreReplayer replayer(pOnMessage);
+      CALL_RETURN_NONE(pStore->replay(replayer));
+    }
+
+    static PyObject* replay_single(obj* self, PyObject* args)
+    {
+      PublishStore* pStore = self->impl;
+      PyObject* pOnMessage = NULL;
+      unsigned long long seq = 0;
+      if (!PyArg_ParseTuple(args, "OK", &pOnMessage, &seq))
+      {
+        return NULL;
+      }
+      PyClientStoreReplayer replayer(pOnMessage);
+      CALL_RETURN_NONE(pStore->replaySingle(replayer, seq));
+    }
+
     static PyObject* get_unpersisted_count(obj* self, PyObject* args)
     {
-      return PyInt_FromSize_t( self->impl->unpersistedCount() );
+      CALL_RETURN_SIZE_T(self->impl->unpersistedCount());
+    }
+
+    static PyObject* get_lowest_unpersisted(obj* self, PyObject* args)
+    {
+      PublishStore* pStore = self->impl;
+      CALL_RETURN_UINT64_T(pStore->getLowestUnpersisted());
+    }
+
+    static PyObject* get_last_persisted(obj* self, PyObject* args)
+    {
+      PublishStore* pStore = self->impl;
+      CALL_RETURN_UINT64_T(pStore->getLastPersisted());
     }
 
     static PyObject* truncate_on_close(obj* self, PyObject* args)
@@ -164,7 +279,18 @@ namespace ampspy
       .setDoc("AMPS PublishStore Object\n\n"
               " Stores published records in a file while awaiting an ACK from the server. Construct with the name of the file to use for record storage\n"
               " and optionally, a Boolean to specify if the store should throw an exception if logging onto a server that might be missing messages not in the store.\n")
+      .addMethod("store", store, "store()\n\nStore the provided message into the publish store. Returns the sequence number that should be assigned to the message.\n\n"
+                                                  ":param message: The message to put into the store.\n")
+      .addMethod("discard_up_to", discard_up_to, "discard_up_to()\n\nDiscard all messages in the publish store with a sequence number less than or equal to the provided argument.\n\n"
+                                                  ":param sequence: The highest sequence number to discard.\n")
+      .addMethod("replay", replay, "replay()\n\nReplays all messages currently in the publish store via the provided message handler.\n"
+                                                  ":param handler: The message handler to call with each message.\n")
+      .addMethod("replay_single", replay_single, "replay_single()\n\nReplays the message with the given sequence number if it is currently in the publish store via the provided message handler.\n"
+                                                  ":param handler: The message handler to call with each message.\n"
+                                                  ":param sequence: The sequence number of the message to replay.\n")
       .addMethod("get_unpersisted_count", get_unpersisted_count, "get_unpersisted_count()\n\nReturns the number of messages published which have not been ACK'ed by the server.\n")
+      .addMethod("get_lowest_unpersisted", get_lowest_unpersisted, "get_lowest_unpersisted()\n\nReturns the sequence number of the oldest message in the publish store.\n")
+      .addMethod("get_last_persisted", get_last_persisted, "get_last_persisted()\n\nReturns the sequence number of last message ACK'ed by the server.\n")
       .addMethod("set_resize_handler", set_resize_handler, "set_resize_handler()\n\nSets the object to call when the store needs to resize.\n")
       .addMethod("truncate_on_close", truncate_on_close, "truncate_on_close()\n\nSets if the PublishStore should truncate the file to initial capacity when it closes if it is empty.\n")
       .addMethod("get_error_on_publish_gap", get_error_on_publish_gap, "get_error_on_publish_gap()\n\nReturns If true, PublishStoreGapException can be thrown\n"